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

Somehow a tortoise 'conflict' got committed

This commit is contained in:
adelikat 2010-05-12 03:23:37 +00:00
parent b5ea58271b
commit 91e4d77283
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/input.h
View File

@ -221,19 +221,12 @@ enum EMUCMD
EMUCMD_MISC_TOGGLEFULLSCREEN, EMUCMD_MISC_TOGGLEFULLSCREEN,
EMUCMD_TOOL_OPENRAMWATCH, EMUCMD_TOOL_OPENRAMWATCH,
EMUCMD_TOOL_OPENRAMSEARCH, EMUCMD_TOOL_OPENRAMSEARCH,
<<<<<<< .mine
EMUCMD_TOOL_RAMSEARCHLT, EMUCMD_TOOL_RAMSEARCHLT,
EMUCMD_TOOL_RAMSEARCHGT, EMUCMD_TOOL_RAMSEARCHGT,
EMUCMD_TOOL_RAMSEARCHLTE, EMUCMD_TOOL_RAMSEARCHLTE,
EMUCMD_TOOL_RAMSEARCHGTE, EMUCMD_TOOL_RAMSEARCHGTE,
EMUCMD_TOOL_RAMSEARCHEQ, EMUCMD_TOOL_RAMSEARCHEQ,
EMUCMD_TOOL_RAMSEARCHNE, EMUCMD_TOOL_RAMSEARCHNE,
=======
EMUCMD_CHEAT_SEARCHEQ,
EMUCMD_CHEAT_SEARCHNE,
EMUCMD_CHEAT_SEARCHLT,
EMUCMD_CHEAT_SEARCHGT,
>>>>>>> .r1856
EMUCMD_MAX EMUCMD_MAX
}; };