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/citra_qt/bootmanager.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/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index bb75633b6..57fde6caa 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -9,11 +9,11 @@ | |||
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | #include "citra_qt/bootmanager.h" | 11 | #include "citra_qt/bootmanager.h" |
| 12 | #include "common/key_map.h" | ||
| 13 | #include "common/microprofile.h" | 12 | #include "common/microprofile.h" |
| 14 | #include "common/scm_rev.h" | 13 | #include "common/scm_rev.h" |
| 15 | #include "common/string_util.h" | 14 | #include "common/string_util.h" |
| 16 | #include "core/core.h" | 15 | #include "core/core.h" |
| 16 | #include "core/frontend/key_map.h" | ||
| 17 | #include "video_core/debug_utils/debug_utils.h" | 17 | #include "video_core/debug_utils/debug_utils.h" |
| 18 | #include "video_core/video_core.h" | 18 | #include "video_core/video_core.h" |
| 19 | 19 | ||