scummvm/backends
Bastien Bouclet b77469a4d3 Merge remote-tracking branch 'origin/master' into sprint
Conflicts:
	backends/events/sdl/sdl-events.cpp
	backends/events/sdl/sdl-events.h
	video/bink_decoder.cpp
2012-01-07 08:43:26 +01:00
..
audiocd sync with scummvm dated 03 july 2011 2011-07-20 06:58:19 +02:00
events Merge remote-tracking branch 'origin/master' into sprint 2012-01-07 08:43:26 +01:00
fs sync with scummvm 2012-01-06 22:56:21 +01:00
graphics renames 2012-01-06 23:29:45 +01:00
keymapper sync with scummvm 2012-01-06 22:56:21 +01:00
log sync with scummvm 2012-01-06 22:56:21 +01:00
midi sync with scummvm 2012-01-06 22:56:21 +01:00
mixer sync with scummvm dated 03 july 2011 2011-07-20 06:58:19 +02:00
mutex sync with scummvm 2011-05-18 23:33:39 +02:00
platform/sdl sync with scummvm 2012-01-06 22:56:21 +01:00
plugins sync with scummvm dated 03 july 2011 2011-07-20 06:58:19 +02:00
saves rename -> ResidualVM 2012-01-06 11:37:57 +01:00
taskbar sync with scummvm 2012-01-06 22:56:21 +01:00
timer sync with scummvm 2012-01-06 22:56:21 +01:00
updates/macosx added missing files for os x 2012-01-06 23:36:00 +01:00
vkeybd sync with scummvm 2012-01-06 22:56:21 +01:00
base-backend.cpp sync with scummvm 2012-01-06 22:56:21 +01:00
base-backend.h sync with scummvm dated 03 july 2011 2011-07-20 06:58:19 +02:00
modular-backend.cpp SDL: Fix copying the screen to the overlay 2011-08-29 21:44:40 +02:00
modular-backend.h SDL: Fix copying the screen to the overlay 2011-08-29 21:44:40 +02:00
module.mk sync with scummvm 2012-01-06 22:56:21 +01:00