Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/CMakeLists.txt
This commit is contained in:
Matthew Parlane 2013-04-11 19:55:36 +12:00
commit 0c9d8d34e1
369 changed files with 21804 additions and 18869 deletions

View file

@ -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,