adelikat 4ae0b2cd22 Merge branch 'master' into waterbox2 ... Conflicts: BizHawk.Client.EmuHawk/MainForm.Events.cs BizHawk.Client.EmuHawk/MainForm.cs		2017-06-04 18:18:11 -05:00
..
Binding.cs	Hotkeys for toggling Gameboy	2017-06-04 14:14:06 -05:00
Config.cs	make snes9x the default snes core	2017-06-03 09:28:43 -05:00
ConfigPersistAttribute.cs	misc code cleanups in BizHawk.Client.Common	2017-04-14 14:59:01 -05:00
ConfigService.cs	more misc Client.Common cleanups	2017-05-17 13:18:26 -05:00
PathEntry.cs	NGP - paths, display text	2017-05-31 19:09:31 -05:00
ToolDialogSettings.cs	more misc Client.Common cleanups	2017-05-17 13:18:26 -05:00