Sappharad ecd9800968 Merge branch 'master' into mono-portable ... Conflicts: BizHawk.Client.DiscoHawk/DiscoHawk.cs BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2017-03-14 20:36:35 -05:00
..
mupen64plusAudioApi.cs	Merge Pull request 28cc5f6621 incorrectly because it's so old that it won't patch.	2016-03-08 20:59:25 -06:00
mupen64plusCoreApi.cs	Merge branch 'master' into mono-portable	2017-03-14 20:36:35 -05:00
mupen64plusInputApi.cs	Merge Pull request 28cc5f6621 incorrectly because it's so old that it won't patch.	2016-03-08 20:59:25 -06:00
mupen64plusVideoApi.cs	Merge branch 'master' into mono-portable	2016-10-18 18:23:07 -05:00