Merge remote-tracking branch 'upstream/master'

Conflicts: rpcs3/Emu/GS/GL/GLGSRender.cpp rpcs3/Gui/InterpreterDisAsm.cpp rpcs3/Gui/MainFrame.cpp
2013-09-03 19:26:31 +02:00
parent f42e6d7374 5cc488011f
commit f4b98074b0
117 changed files with 11008 additions and 2535 deletions
@@ -7,7 +7,12 @@ Inis Ini;

 static bool StringToBool(const wxString str)
 {
-	if(!str.CmpNoCase("enable") || !str.CmpNoCase("e") || !str.CmpNoCase("1"))
+	if(
+		!str.CmpNoCase("enable") ||
+		!str.CmpNoCase("e") ||
+		!str.CmpNoCase("1") ||
+		!str.CmpNoCase("true") ||
+		!str.CmpNoCase("t") )
 	{
 		return true;
 	}