Johannes Schickel a02454644a Merge branch 'master' into osystem-palette
Conflicts:
	backends/platform/wii/osystem_gfx.cpp
2011-02-15 23:42:50 +01:00
..
2011-02-11 15:02:15 +00:00