Sappharad 464bba9454 Merge branch 'master' into mono-portable ... # Conflicts: # BizHawk.Client.EmuHawk/MainForm.Events.cs # BizHawk.Client.EmuHawk/Properties/Resources.resx # BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs		2017-06-04 19:31:56 -05:00
..
ControlExtensions.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
CoreExtensions.cs	delete more meteor stuff	2017-05-27 07:51:11 -05:00
ToolExtensions.cs	tastudio: GlobalWin.MainForm alias	2016-08-29 19:38:36 +03:00