Commit Graph

3 Commits

Author SHA1 Message Date
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
adelikat 735249a841 misc cleanups in NES config files 2017-05-31 09:47:38 -05:00
adelikat bb8bac3fb3 NesHawk - UI for setting VS dipswitches 2016-11-05 17:32:58 -05:00