diff options
| author | uruk | 2013-09-08 12:57:34 +0200 |
|---|---|---|
| committer | uruk | 2013-09-08 12:57:34 +0200 |
| commit | 3950c871f220be48da65e44c87362016af8af340 (patch) | |
| tree | 85ea6063564f828d5f0a5f41b2d60eeb0672e468 /gui/gui-manager.cpp | |
| parent | 48f2a79ed2adefbc9b3fe79ef1dc54e052871d83 (diff) | |
| parent | e6956a994b980e81cd83784b67b7feb0d2250a75 (diff) | |
| download | scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.tar.gz scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.tar.bz2 scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.zip | |
AVALANCHE: Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts:
engines/avalanche/animation.cpp
Diffstat (limited to 'gui/gui-manager.cpp')
0 files changed, 0 insertions, 0 deletions