ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
BizHawk/genplus-gx32
History
Sappharad 7f5aa0ae77 Merge branch 'master' into mono-portable 
Conflicts:
	.gitignore
	BizHawk.Client.Common/PathManager.cs
	BizHawk.Client.Common/lua/LuaSandbox.cs
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs
	BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/Program.cs
	BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
	BizHawk.Client.EmuHawk/movie/PlayMovie.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
	BizHawk.Emulation.Cores/LibretroOld/LibRetro.cs
	Version/VersionInfo.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 		2017-05-02 20:38:56 -05:00
..
cinterface Merge branch 'master' into mono-portable 2017-02-21 20:02:00 -06:00
core genesis svp 2017-04-16 16:14:32 -04:00
libretro Fresh build of libgpgx, and the updated version number. 2017-02-21 20:33:29 -06:00
HISTORY.txt check in files 2016-08-09 20:03:23 +03:00
LICENSE.txt check in files 2016-08-09 20:03:23 +03:00
Makefile.gc check in files 2016-08-09 20:03:23 +03:00
Makefile.libretro check in files 2016-08-09 20:03:23 +03:00
Makefile.wii check in files 2016-08-09 20:03:23 +03:00