Merge branch 'raven02-patch-15'

Conflicts:
	UI/MenuScreens.cpp
This commit is contained in:
Henrik Rydgård committed 2013-05-16 17:21:13 +02:00
commit e104b8436f
6 files changed
+44 -79

No files matched your search

-2
View File
@@ -152,8 +152,6 @@ void Config::Load(const char *iniFileName)
pspConfig->Get("EncryptSave", &bEncryptSave, true);
CleanRecent();
// Ephemeral settings
bDrawWireframe = false;
}
void Config::Save()