diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-23 17:35:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 17:35:35 -0500 |
| commit | 51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch) | |
| tree | a38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/core/settings.cpp | |
| parent | 56e4066f4f51fe944dcbb2f6cbff2cbe823915ed (diff) | |
| parent | 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (diff) | |
Merge pull request #2369 from MerryMage/core-frontend
core: Move emu_window and key_map into core
Diffstat (limited to 'src/core/settings.cpp')
| -rw-r--r-- | src/core/settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index 626e06cd9..5d23c52f9 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -7,7 +7,7 @@ #include "settings.h" #include "video_core/video_core.h" -#include "common/emu_window.h" +#include "core/frontend/emu_window.h" namespace Settings { |