aboutsummaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-11-19 15:24:46 -0500
committerbunnei <bunneidev@gmail.com>2014-11-19 15:24:46 -0500
commitc0cd0fa78edc37795176c6fb45a52c1d015f3690 (patch)
tree237f15dd9d986309000c995fde07088625e62239 /src/citra
parent112768f4365816d345b0dc9b93bfecc3d41a69b5 (diff)
parent739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7 (diff)
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.cpp2
-rw-r--r--src/citra/emu_window/emu_window_glfw.h4
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) {
}
Config config;
-
+
if (!Settings::values.enable_log)
LogManager::Shutdown();
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:
/// Swap buffers to display the next frame
void SwapBuffers() override;
- /// Polls window events
- void PollEvents() override;
+ /// Polls window events
+ void PollEvents() override;
/// Makes the graphics context current for the caller thread
void MakeCurrent() override;