INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-12 05:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'threading' of https://github.com/bunnei/citra

Browse Source 
Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
This commit is contained in:
bunnei
2014-06-14 12:13:16 -04:00
parent c34ba38001 b45a38f557
commit 004df76795
41 changed files with 1279 additions and 1235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hw/gpu.cpp
View File

@ -17,8 +17,6 @@ namespace GPU {
Registers g_regs;
static const u32 kFrameTicks = 268123480 / 60; ///< 268MHz / 60 frames per second
u64 g_last_ticks = 0; ///< Last CPU ticks
/**