Merge branch 'master' into TemporaryHackishBranch

GPU/D3D11/FramebufferManagerD3D11.cpp

@@ -24,7 +24,6 @@
 #include "base/basictypes.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
-#include "i18n/i18n.h"
 
 #include "Common/ColorConv.h"
 #include "Common/MathUtil.h"

GPU/Vulkan/FramebufferVulkan.cpp

@@ -23,7 +23,6 @@
 #include "base/timeutil.h"
 #include "math/lin/matrix4x4.h"
 #include "math/dataconv.h"
-#include "i18n/i18n.h"
 #include "ext/native/file/vfs.h"
 #include "ext/native/thin3d/thin3d.h"
 

Windows/MainWindowMenu.cpp

@@ -1410,7 +1410,7 @@ namespace MainWindow {
 			break;
 		}
 
-#if PPSSPP_API(ANY_GL)
+#if !PPSSPP_API(ANY_GL)
 		EnableMenuItem(menu, ID_DEBUG_GEDEBUGGER, MF_GRAYED);
 #endif