Sappharad e0d2a88f07 Merge branch 'master' into mono-portable ... Conflicts: BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs		2016-12-12 20:29:18 -06:00
..
MacroInput.ButtonSelect.cs	Macro tool button select works	2015-03-11 16:14:02 +00:00
MacroInput.Designer.cs	Various fixes	2015-03-22 16:55:34 +00:00
MacroInput.cs	Merge branch 'master' into mono-portable	2016-12-12 20:29:18 -06:00
MacroInput.resx	Start a Macro Input tool	2015-03-08 20:11:02 +00:00
MovieZone.cs	Rename IController.Type to IController.Definition to more clearly describe the property	2016-12-12 12:30:32 -06:00