From 0ec0c6eb92d640f1d20f3c25d263f80874982796 Mon Sep 17 00:00:00 2001
From: vnctdj <3978690+vnctdj@users.noreply.github.com>
Date: Sun, 12 May 2019 16:35:12 +0200
Subject: [PATCH 1/2] Remove the related #include

Following https://github.com/hrydgard/ppsspp/pull/12030
Oops, I forgot to check if it was still needed...
---
 GPU/D3D11/FramebufferManagerD3D11.cpp | 1 -
 GPU/Vulkan/FramebufferVulkan.cpp      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp
index 92d6dabd55..52231e4be6 100644
--- a/GPU/D3D11/FramebufferManagerD3D11.cpp
+++ b/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"
diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp
index 98cbb9a6b7..fa667ec7bd 100644
--- a/GPU/Vulkan/FramebufferVulkan.cpp
+++ b/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"
 

From 2da9de9fe70d386bbe77c85e4dd6705a64c5167b Mon Sep 17 00:00:00 2001
From: LunaMoo <luna2moo@gmail.com>
Date: Sun, 12 May 2019 17:50:25 +0200
Subject: [PATCH 2/2] Fix typo which disabled GEDebugger

---
 Windows/MainWindowMenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 24b3b7c571..66ab52cfab 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -1335,7 +1335,7 @@ namespace MainWindow {
 			break;
 		}
 
-#if PPSSPP_API(ANY_GL)
+#if !PPSSPP_API(ANY_GL)
 		EnableMenuItem(menu, ID_DEBUG_GEDEBUGGER, MF_GRAYED);
 #endif