Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable ... # Conflicts: # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs # libmupen64plus/mupen64plus-win32-deps # libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2019-10-03 21:33:28 -05:00
..
Makefile	snes-support 64bit bsnes builds. this isnt tested yet since i dont have a 64bit system atm, but most of the infrastructure is there	2012-12-26 20:25:06 +00:00
libsnes.cpp	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
libsnes.hpp	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
libsnes_pwrap.cpp	Merge remote-tracking branch 'origin/1.x' into mono-portable	2019-10-03 21:33:28 -05:00