diff options
| author | Johannes Schickel | 2011-02-19 21:42:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-02-19 21:46:45 +0100 |
| commit | e21d6e0d1120e917a4a019a4070ec4db5e988b9b (patch) | |
| tree | 1142828b72ccf17d513c621e108d749f148fd32b /common/serializer.h | |
| parent | 32d0e4c15fb33f80db194087850466664a43516a (diff) | |
| parent | b26f30b98793c522265a3eeb48fb3b41034663c6 (diff) | |
| download | scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.gz scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.tar.bz2 scummvm-rg350-e21d6e0d1120e917a4a019a4070ec4db5e988b9b.zip | |
Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
backends/platform/android/android.cpp
engines/sci/graphics/screen.cpp
engines/sci/graphics/transitions.cpp
Diffstat (limited to 'common/serializer.h')
0 files changed, 0 insertions, 0 deletions