mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 13:48:56 +00:00
Merge branch 'master' into wii-network
Conflicts: Source/Core/Core/CMakeLists.txt
This commit is contained in:
commit
0c9d8d34e1
369 changed files with 21804 additions and 18869 deletions
|
@ -120,6 +120,7 @@ LogManager::~LogManager()
|
|||
|
||||
delete m_fileLog;
|
||||
delete m_consoleLog;
|
||||
delete m_debuggerLog;
|
||||
}
|
||||
|
||||
void LogManager::Log(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue