Matthew Hoops e1dc4db7aa Merge remote branch 'upstream/master' into pegasus ... Conflicts: video/qt_decoder.cpp		2011-10-07 14:34:22 -04:00
..
commandLine.cpp	AUDIO: add registerDefault for music_driver	2011-07-04 17:19:22 +02:00
commandLine.h	COMMON: Modify Base::processSettings, get rid of Common::kArgumentNotProcessed	2011-05-23 19:39:25 +02: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: Slight cleanup.	2011-10-06 00:29:22 +02:00
main.h	GIT: Clean up: Suppress SVN tags, now useless	2011-05-12 01:16:22 +02:00
module.mk	Moved base/game.* to engines/game.*	2008-09-17 17:31:29 +00:00
plugins.cpp	Merge remote branch 'upstream/master' into pegasus	2011-10-07 14:34:22 -04:00
plugins.h	ALL: Remove trailing whitespaces	2011-06-20 00:59:48 +02:00
version.cpp	JANITORIAL: Remove trailing empty lines.	2011-08-07 13:53:33 +02:00
version.h	GIT: Clean up: Suppress SVN tags, now useless	2011-05-12 01:16:22 +02:00