Conflicts fixed

This commit is contained in:
Nekotekina 2014-12-26 17:06:36 +03:00
commit be2d606193
51 changed files with 1850 additions and 657 deletions

View file

@ -133,7 +133,7 @@ void CPUThreadManager::Exec()
{
std::lock_guard<std::mutex> lock(m_mtx_thread);
for(u32 i=0; i<m_threads.size(); ++i)
for(u32 i = 0; i < m_threads.size(); ++i)
{
m_threads[i]->Exec();
}