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
..
AssemblyInfo.cs	Emulation.Common cleanups	2017-04-27 11:37:26 -05:00
Resources.Designer.cs	delete more meteor stuff	2017-05-27 07:51:11 -05:00
Resources.resources	Merge branch 'master' into mono-portable	2015-12-21 21:58:13 -06:00
Resources.resx	Merge branch 'master' into mono-portable	2017-06-04 19:31:56 -05:00
Settings.Designer.cs	Rename Multiclient folder	2013-11-03 04:05:56 +00:00