archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 02:08:49 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts

Browse source
This commit is contained in:
Nekotekina 2014-07-11 10:09:38 +04:00
commit 259b57c64a
53 changed files with 366 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View file

@ -12,7 +12,7 @@
//void cellGcmSys_load();
//void cellGcmSys_unload();
//Module cellGcmSys(0x0010, cellGcmSys_init, cellGcmSys_load, cellGcmSys_unload);
extern Module *cellGcmSys = nullptr;
Module *cellGcmSys = nullptr;
u32 local_size = 0;
u32 local_addr = 0;