Merge branch 'master' into threading

This commit is contained in:
bunnei 2014-05-17 13:35:20 -04:00
commit 3fac6dc39e
8 changed files with 44 additions and 30 deletions

View file

@ -6,6 +6,8 @@
#include "core/core.h"
#include "core/loader.h"
#include "core/hw/hw.h"
#include "video_core/video_core.h"
#include "version.h"
@ -40,6 +42,7 @@ void EmuThread::run()
emit CPUStepped();
}
}
HW::Update();
}
Core::Stop();