ALL: Fix merge

This commit is contained in:
Joel Teichroeb 2014-05-24 22:53:30 -07:00
parent 2f1a4f7b7b
commit ee412e972b

View File

@ -64,7 +64,7 @@ const char *gScummVMFullVersion = "ResidualVM " SCUMMVM_VERSION " - PlayStation2
const char *gScummVMBuildDate = __DATE__ " " __TIME__;
const char *gScummVMVersionDate = SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
const char *gScummVMFullVersion = "ResidualVM " SCUMMVM_VERSION " (" __DATE__ " " __TIME__ ")";
#else
#endif
const char *gScummVMFeatures = ""
#ifdef TAINTED_BUILD
// TAINTED means the build contains engines/subengines not enabled by default