diff options
| author | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/core/core.cpp | |
| parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
| parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 865898b241..22213d647b 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,5 +1,5 @@ // Copyright 2014 Citra Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2 or any later version // Refer to the license.txt file included. #include "common/common_types.h" @@ -47,7 +47,7 @@ void Stop() { /// Initialize the core int Init() { - NOTICE_LOG(MASTER_LOG, "initialized OK"); + LOG_DEBUG(Core, "initialized OK"); disasm = new ARM_Disasm(); g_sys_core = new ARM_Interpreter(); @@ -72,7 +72,7 @@ void Shutdown() { delete g_app_core; delete g_sys_core; - NOTICE_LOG(MASTER_LOG, "shutdown OK"); + LOG_DEBUG(Core, "shutdown OK"); } } // namespace |