diff options
| author | uruk | 2013-09-08 11:35:26 +0200 |
|---|---|---|
| committer | uruk | 2013-09-08 11:35:26 +0200 |
| commit | f7de651560578e95db4c5fa4c67a50488d4658ef (patch) | |
| tree | 3e757b224b4d19bf6933dd1d95ba94623f0044a2 /gui | |
| parent | aafaaef37f76f9deb6d34c2ef76da87d103e7b52 (diff) | |
| parent | f42f29d8f8e1cc39b02cf1827318ff8fb59d3dd7 (diff) | |
| download | scummvm-rg350-f7de651560578e95db4c5fa4c67a50488d4658ef.tar.gz scummvm-rg350-f7de651560578e95db4c5fa4c67a50488d4658ef.tar.bz2 scummvm-rg350-f7de651560578e95db4c5fa4c67a50488d4658ef.zip | |
Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts:
engines/avalanche/acci2.cpp
engines/avalanche/lucerna2.cpp
engines/avalanche/timer.cpp
Diffstat (limited to 'gui')
0 files changed, 0 insertions, 0 deletions