ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,306 Commits 95 Branches 91 Tags 2.5 GiB
Commit Graph

4 Commits

Author SHA1 Message Date
Sappharad ecd9800968 Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.DiscoHawk/DiscoHawk.cs
	BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2017-03-14 20:36:35 -05:00
Sappharad 07a1709dbb Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/tools/GameShark.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
 2016-10-18 18:23:07 -05:00
Sappharad 3cf4d3464d Merge branch 'master' into mono-portable 
Conflicts:
	BizHawk.Client.EmuHawk/tools/TraceLogger.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
 2016-08-23 21:21:57 -05:00
Sappharad 43fa37f5d0 Merge Pull request 28cc5f6621 incorrectly because it's so old that it won't patch. 2016-03-08 20:59:25 -06:00