diff options
| author |  bunnei | 2014-04-18 17:52:49 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-18 17:52:49 -0400 |
| commit | 958bca606e80110e05d7c142dda3097fddc96503 (patch) | |
| tree | 576917751444b4dfdb476d040b4e075bde431b7b /src/core/core.cpp | |
| parent | Init window size from VideoCore. Start changing the default window behavior... (diff) | |
| parent | renamed hw_lcd module to just lcd (diff) | |
| download | yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.gz yuzu-958bca606e80110e05d7c142dda3097fddc96503.tar.xz yuzu-958bca606e80110e05d7c142dda3097fddc96503.zip | |
Merge branch 'hle-interface'
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 28f6b6c58..859a62c78 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -40,7 +40,7 @@ void Stop() { | |||
| 40 | 40 | ||
| 41 | /// Initialize the core | 41 | /// Initialize the core |
| 42 | int Init() { | 42 | int Init() { |
| 43 | NOTICE_LOG(MASTER_LOG, "Core initialized OK"); | 43 | NOTICE_LOG(MASTER_LOG, "initialized OK"); |
| 44 | 44 | ||
| 45 | g_disasm = new ARM_Disasm(); | 45 | g_disasm = new ARM_Disasm(); |
| 46 | g_app_core = new ARM_Interpreter(); | 46 | g_app_core = new ARM_Interpreter(); |
| @@ -54,7 +54,7 @@ void Shutdown() { | |||
| 54 | delete g_app_core; | 54 | delete g_app_core; |
| 55 | delete g_sys_core; | 55 | delete g_sys_core; |
| 56 | 56 | ||
| 57 | NOTICE_LOG(MASTER_LOG, "Core shutdown OK"); | 57 | NOTICE_LOG(MASTER_LOG, "shutdown OK"); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | } // namespace | 60 | } // namespace |