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

Merge branch 'master' of github.com:libretro/snes9x 

Conflicts:
	memmap.cpp
This commit is contained in:
Alcaro 2014-06-13 12:07:01 +02:00
parent eef3a9dec5 ff045f3292
commit eb80e28817
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
memmap.cpp
View File

@ -202,7 +202,7 @@
#include "display.h"
#ifdef __LIBRETRO__
#include "libretro.h"
#include "libretro/libretro.h"
void S9xAppendMapping(struct retro_memory_descriptor *desc);
#endif