Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable ... # Conflicts: # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs # libmupen64plus/mupen64plus-win32-deps # libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2019-10-03 21:33:28 -05:00
..
Binding.cs	Hotkeys for toggling Gameboy	2017-06-25 09:38:18 -05:00
Config.cs	Merge remote-tracking branch 'origin/1.x' into mono-portable	2019-10-03 21:33:28 -05:00
ConfigPersistAttribute.cs	misc code cleanups in BizHawk.Client.Common	2017-04-14 14:59:01 -05:00
ConfigService.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
PathEntry.cs	Client.Common cleanups	2017-05-18 11:36:38 -05:00
ToolDialogSettings.cs	more misc Client.Common cleanups	2017-05-17 13:18:26 -05:00