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

..

commandLine.cpp

sync with scummvm

2012-01-06 22:56:21 +01:00

commandLine.h

ALL: sync with scummvm

2011-06-09 11:17:15 +02:00

internal_revision.h.in

rename -> ResidualVM

2012-01-06 11:37:57 +01:00

internal_version.h

rename -> ResidualVM

2012-01-06 11:37:57 +01:00

internal_version.h.in

rename -> ResidualVM

2012-01-06 11:37:57 +01:00

main.cpp

sync with scummvm

2012-01-06 22:56:21 +01:00

main.h

rename -> ResidualVM

2012-01-06 11:37:57 +01:00

module.mk

import some code from scummvm to allow implement later multi engine support

2009-05-24 21:31:05 +00:00

plugins.cpp

Merge branch 'master' into sprint

2012-01-04 17:36:12 +01:00

plugins.h

rename -> ResidualVM

2012-01-06 11:37:57 +01:00

version.cpp

sync with scummvm

2012-01-06 22:56:21 +01:00

version.h

rename -> ResidualVM

2012-01-06 11:37:57 +01:00