diff options
| author |  bunnei | 2014-08-15 09:53:57 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-15 09:53:57 -0400 |
| commit | d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0 (patch) | |
| tree | b226b58f2ca96c584a72c2ab7e6fc7b63d56e7cc /src/citra | |
| parent | Merge pull request #43 from archshift/iftree (diff) | |
| parent | Bootmanager: changed `filename` to std::string (diff) | |
| download | yuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.tar.gz yuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.tar.xz yuzu-d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0.zip | |
Merge pull request #47 from archshift/stdstring
Bootmanager: changed `filename` to std::string
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index f882a825e..02f524e03 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include "video_core/video_core.h" | 7 | #include "video_core/video_core.h" |
| 8 | 8 | ||
| 9 | #include "citra/citra.h" | ||
| 10 | #include "citra/emu_window/emu_window_glfw.h" | 9 | #include "citra/emu_window/emu_window_glfw.h" |
| 11 | 10 | ||
| 12 | static void OnKeyEvent(GLFWwindow* win, int key, int action) { | 11 | static void OnKeyEvent(GLFWwindow* win, int key, int action) { |