Johannes Schickel e21d6e0d11 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
2011-02-19 21:46:45 +01:00
..
2010-03-18 15:54:40 +00:00
2011-02-09 01:09:01 +00:00
2011-02-09 01:09:01 +00:00