Matthew Hoops a1d41da096 Merge remote branch 'upstream/master' into t7g-ios ... Conflicts: audio/decoders/qdm2.h common/util.cpp engines/groovie/music.cpp engines/groovie/resource.h video/qt_decoder.cpp video/qt_decoder.h		2011-05-11 00:30:28 -04:00
..
commandLine.cpp	ALL: Mark printf and various other symbols as forbidden	2011-05-02 16:31:31 +02:00
commandLine.h	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
internal_revision.h.in	CREATE_PROJECT: Update revision number support (fixes bug #3280881)	2011-04-24 16:59:46 -04:00
internal_version.h	RELEASE: This is 1.4.0git	2011-05-01 14:44:20 +03:00
internal_version.h.in	CREATE_PROJECT: Update revision number support (fixes bug #3280881)	2011-04-24 16:59:46 -04:00
main.cpp	BASE: Suppress pointless warning message (fixes bug #3291522)	2011-05-05 17:43:33 +02:00
main.h	argv should not be modified; make it plenty const.	2009-03-21 16:07:46 +00:00
module.mk	Moved base/game.* to engines/game.*	2008-09-17 17:31:29 +00:00
plugins.cpp	Merge remote branch 'remotes/dreammaster/tsage'	2011-04-13 21:08:05 +10:00
plugins.h	JANITORIAL: Reduce header dependencies in shared code	2011-04-28 15:08:58 +03:00
version.cpp	BASE: Add AAC to the version string when compiled in	2011-04-11 21:37:44 -04:00
version.h	Fixed the spaces before tabs.	2008-01-28 00:14:17 +00:00