Commit Graph

9 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
Sappharad 5b466e5d70 New portable branch re-created from master with hopefully all of the changes made to the old one, plus some cleanup of things that got mangled from repeated merges. 2015-06-23 22:22:11 -05:00
adelikat 2e737e66be NES - remove some more unnecessary partial class usage 2015-01-19 13:38:08 +00:00
jlennox a64017366c Create ISettable<T,T2>/ISettable interfaces. This checkin has not been extensively tested. 2014-10-19 01:22:47 +00:00
zeromus dd8638ba06 improved life cycle management of picturebox images (dont we have some direct substitute for picturebox which doesnt suck so much?) 2014-08-14 15:51:49 +00:00
adelikat d047e1f45c I'm picky about namespaces 2014-08-03 13:51:40 +00:00
adelikat ab5cfab035 remove redundant code throughout the emuhawk project 2014-06-29 02:28:48 +00:00
goyuken 1f1bb93360 quicknes: some settings stuff, not all finished 2014-01-09 23:50:10 +00:00