thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'upstream/master' into t7g-ios

Browse source 
Conflicts:
	audio/decoders/qdm2.h
	common/util.cpp
	engines/groovie/music.cpp
	engines/groovie/resource.h
	video/qt_decoder.cpp
	video/qt_decoder.h
This commit is contained in:
Matthew Hoops 2011-05-11 00:30:02 -04:00
commit a1d41da096
1292 changed files with 16937 additions and 13332 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/util.cpp
View file

@ -23,9 +23,9 @@
*/
#include "common/util.h"
#include "common/system.h"
#include "common/translation.h"
#include "common/config-manager.h"
#include "common/debug.h"
namespace Common {
@ -213,7 +213,7 @@ const PlatformDescription g_platforms[] = {
{ "segacd", "segacd", "sega", "SegaCD", kPlatformSegaCD },
{ "windows", "win", "win", "Windows", kPlatformWindows },
{ "playstation", "psx", "psx", "Sony PlayStation", kPlatformPSX },
{ "cdi", "cdi", "cdi", "Phillips CD-i", kPlatformCDi },
{ "cdi", "cdi", "cdi", "Philips CD-i", kPlatformCDi },
{ "ios", "ios", "ios", "Apple iOS", kPlatformIOS },
{ 0, 0, 0, "Default", kPlatformUnknown }