diff options
author | MerryMage <MerryMage@users.noreply.github.com> | 2016-12-23 13:37:40 +0000 |
---|---|---|
committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-12-23 13:42:39 +0000 |
commit | 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (patch) | |
tree | 8874f16f9f840add798f58981d5c2fcdf4da3c84 /src/core/settings.cpp | |
parent | 5e8ef0049752296851cbdc567af9ec360451fea1 (diff) |
core: Move emu_window and key_map into core
* Removes circular dependences (common should not depend on 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 626e06cd92..5d23c52f90 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 { |