Fixed conflicts

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

View file

@ -20,7 +20,7 @@ typedef void (*CellHddGameStatCallback)(mem_ptr_t<CellHddGameCBResult> cbResult,
//void cellSysutil_init();
//Module cellSysutil(0x0015, cellSysutil_init);
Module *cellSysutil;
Module *cellSysutil = nullptr;
int cellSysutilGetSystemParamInt(int id, mem32_t value)
{