scummvm

mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00

History

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

2011-07-04 17:19:22 +02:00

commandLine.h

2011-05-23 19:39:25 +02:00

internal_revision.h.in

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

2011-04-24 16:59:46 -04:00

main.cpp

BASE: Slight cleanup.

2011-10-06 00:29:22 +02:00

main.h

2011-05-12 01:16:22 +02:00

module.mk

2008-09-17 17:31:29 +00:00

plugins.cpp

2011-10-07 14:34:22 -04:00

plugins.h

2011-06-20 00:59:48 +02:00

version.cpp

2011-08-07 13:53:33 +02:00

version.h

2011-05-12 01:16:22 +02:00