summaryrefslogtreecommitdiffstats
path: root/src/core/frontend/emu_window.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-23 23:35:35 +0100
committerGitHub <noreply@github.com>2016-12-23 23:35:35 +0100
commit51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch)
treea38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/core/frontend/emu_window.cpp
parentMerge pull request #2370 from wwylele/where-is-my-shared-font (diff)
parentcore: Move emu_window and key_map into core (diff)
downloadyuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.gz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.bz2
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.lz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.xz
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.zst
yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.zip
Diffstat (limited to '')
-rw-r--r--src/core/frontend/emu_window.cpp (renamed from src/common/emu_window.cpp)4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.cpp b/src/core/frontend/emu_window.cpp
index e3a9e08e6..f6f90f9e1 100644
--- a/src/common/emu_window.cpp
+++ b/src/core/frontend/emu_window.cpp
@@ -5,8 +5,8 @@
#include <algorithm>
#include <cmath>
#include "common/assert.h"
-#include "common/key_map.h"
-#include "emu_window.h"
+#include "core/frontend/emu_window.h"
+#include "core/frontend/key_map.h"
#include "video_core/video_core.h"
void EmuWindow::ButtonPressed(Service::HID::PadState pad) {