diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /icons | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/scummvm.info | bin | 17326 -> 23078 bytes |
| -rw-r--r-- | icons/scummvm_drawer.info | bin | 20738 -> 22916 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/icons/scummvm.info b/icons/scummvm.info Binary files differindex e30a7129ef..f603627122 100644 --- a/icons/scummvm.info +++ b/icons/scummvm.info diff --git a/icons/scummvm_drawer.info b/icons/scummvm_drawer.info Binary files differindex 26f6a8633d..03b62536a2 100644 --- a/icons/scummvm_drawer.info +++ b/icons/scummvm_drawer.info |