diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 11:29:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 11:29:48 -0700 |
| commit | 7d2ec63a203df3b7c2ec12fc88c9bb6c10e8f7af (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/system.cpp | |
| parent | d205bbc7d54f4e0725e6883891f306671390bbb7 (diff) | |
| parent | 739c1d8cf9652e8fad224436a9b6cfe98e875592 (diff) | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/system.cpp')
| -rw-r--r-- | src/core/system.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp index 4fc266cb09..7d54811a02 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -3,21 +3,19 @@ // Refer to the license.txt file included. #include "audio_core/audio_core.h" - #include "core/core.h" #include "core/core_timing.h" -#include "core/system.h" #include "core/gdbstub/gdbstub.h" -#include "core/hw/hw.h" #include "core/hle/hle.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/memory.h" - +#include "core/hw/hw.h" +#include "core/system.h" #include "video_core/video_core.h" namespace System { -static bool is_powered_on{ false }; +static bool is_powered_on{false}; Result Init(EmuWindow* emu_window) { Core::Init(); |
