diff options
| author | 2014-11-19 15:24:46 -0500 | |
|---|---|---|
| committer | 2014-11-19 15:24:46 -0500 | |
| commit | c0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch) | |
| tree | 237f15dd9d986309000c995fde07088625e62239 /src/citra | |
| parent | Merge pull request #208 from lioncash/statics (diff) | |
| parent | Remove tabs in all files except in skyeye imports and in generated GL code (diff) | |
| download | yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.gz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.tar.xz yuzu-c0cd0fa78edc37795176c6fb45a52c1d015f3690.zip | |
Merge pull request #211 from linkmauve/master
Remove trailing spaces from the entire project
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/citra.cpp | 2 | ||||
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 41b62ac16..f2aeb510e 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -23,7 +23,7 @@ int __cdecl main(int argc, char **argv) { | |||
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | Config config; | 25 | Config config; |
| 26 | 26 | ||
| 27 | if (!Settings::values.enable_log) | 27 | if (!Settings::values.enable_log) |
| 28 | LogManager::Shutdown(); | 28 | LogManager::Shutdown(); |
| 29 | 29 | ||
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h index 61cef4e65..5b04e87bb 100644 --- a/src/citra/emu_window/emu_window_glfw.h +++ b/src/citra/emu_window/emu_window_glfw.h | |||
| @@ -16,8 +16,8 @@ public: | |||
| 16 | /// Swap buffers to display the next frame | 16 | /// Swap buffers to display the next frame |
| 17 | void SwapBuffers() override; | 17 | void SwapBuffers() override; |
| 18 | 18 | ||
| 19 | /// Polls window events | 19 | /// Polls window events |
| 20 | void PollEvents() override; | 20 | void PollEvents() override; |
| 21 | 21 | ||
| 22 | /// Makes the graphics context current for the caller thread | 22 | /// Makes the graphics context current for the caller thread |
| 23 | void MakeCurrent() override; | 23 | void MakeCurrent() override; |