diff options
| author | uruk | 2013-09-15 16:54:56 +0200 |
|---|---|---|
| committer | uruk | 2013-09-15 16:54:56 +0200 |
| commit | 98cb1cd52b99713db26ac3724d0968fa2f20a959 (patch) | |
| tree | c9007027100ea92ca43315b9dc190c477c8c21bd /gui/onscreendialog.cpp | |
| parent | d70b856da90ece5cc0d1e210a9992212a5da39a6 (diff) | |
| parent | 83ee99a3814a33d1a9e174cf3b6379d741a516ef (diff) | |
| download | scummvm-rg350-98cb1cd52b99713db26ac3724d0968fa2f20a959.tar.gz scummvm-rg350-98cb1cd52b99713db26ac3724d0968fa2f20a959.tar.bz2 scummvm-rg350-98cb1cd52b99713db26ac3724d0968fa2f20a959.zip | |
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts:
engines/avalanche/lucerna.cpp
engines/avalanche/timer.cpp
Diffstat (limited to 'gui/onscreendialog.cpp')
0 files changed, 0 insertions, 0 deletions