ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

now you know an evil plan of mine :} 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@875 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-10-15 06:13:23 +00:00
parent a6365c758e
commit 2abedd28fe
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/PatchEngine.cpp
View File

@ -146,8 +146,6 @@ void PatchEngine_ApplyARPatches()
if (iter->active) if (iter->active)
RunActionReplayCode(*iter, false); RunActionReplayCode(*iter, false);
} }
<<<<<<< .mine
}=======
} }
void LoadActionReplayCodes(IniFile &ini) void LoadActionReplayCodes(IniFile &ini)
@ -430,4 +428,3 @@ void RunActionReplayCode(const ARCode &code, bool nowIsBootup) {
} }
} }
} }
>>>>>>> .r873