3 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
Hathor86	f70a2c8c6c	Merge from TASVideo	2015-11-01 22:01:19 +01:00
adelikat	6ff3215a5f	Move Exception box from Client.Common to Client.EmuHawk, it is inappropriate to be in Client.Common	2015-10-17 19:18:37 -04:00