diff options
| author |  MerryMage | 2016-12-23 13:37:40 +0000 |
|---|---|---|
| committer | MerryMage | 2016-12-23 13:42:39 +0000 |
| commit | 64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (patch) | |
| tree | 8874f16f9f840add798f58981d5c2fcdf4da3c84 /src/core/settings.cpp | |
| parent | Merge pull request #2364 from mailwl/nwm-services (diff) | |
| download | yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.gz yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.xz yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.zip | |
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 626e06cd9..5d23c52f9 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "settings.h" | 7 | #include "settings.h" |
| 8 | #include "video_core/video_core.h" | 8 | #include "video_core/video_core.h" |
| 9 | 9 | ||
| 10 | #include "common/emu_window.h" | 10 | #include "core/frontend/emu_window.h" |
| 11 | 11 | ||
| 12 | namespace Settings { | 12 | namespace Settings { |
| 13 | 13 | ||