diff options
| author |  bunnei | 2016-12-23 17:35:35 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-23 17:35:35 -0500 |
| commit | 51dd13b8a00f833b5bde88569d5a814c35d13a21 (patch) | |
| tree | a38fa78e0a70e730f53fae3696dad13d4f34ac26 /src/core/settings.cpp | |
| parent | Merge pull request #2370 from wwylele/where-is-my-shared-font (diff) | |
| parent | core: Move emu_window and key_map into core (diff) | |
| download | yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.gz yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.tar.xz yuzu-51dd13b8a00f833b5bde88569d5a814c35d13a21.zip | |
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 @@ | |||
| 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 | ||