Commit Graph

2 Commits

Author SHA1 Message Date
Sappharad ed88569221 Merge branch 'master' into mono-portable
Conflicts:
	BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
	BizHawk.Client.EmuHawk/movie/RecordMovie.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
2016-02-15 18:38:48 -06:00
adelikat 9041281b72 GambatteLink - break up into separate files 2015-01-17 19:10:58 +00:00