Commit Graph

4 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 b34449a820 Basic Bot - Run btn validation 2015-09-06 20:37:46 -04:00
adelikat e73737a20a BasicBot - add sliders to probabilities 2015-09-06 20:28:37 -04:00
adelikat 9e36096472 oops, forgot to check these files in 2015-08-27 08:19:36 -04:00