Sappharad 5573409fad Merge branch 'master' into mono-portable ... # Conflicts: # BizHawk.Client.Common/Extensions.cs # BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs # BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj # BizHawk.Client.EmuHawk/MainForm.Events.cs # BizHawk.Client.EmuHawk/MainForm.cs # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs # BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs # BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs # libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2017-05-23 20:32:48 -05:00
..
MultiDiskBundler.Designer.cs	Get started on C64 support in the multi-disk bundler	2016-03-04 21:50:24 -05:00
MultiDiskBundler.cs	Merge branch 'master' into mono-portable	2017-05-23 20:32:48 -05:00
MultiDiskBundler.resx	start the MultiDiskBundler tool, that will make it easy to make multi-game xml files such as for Apple II and dual gameboy (and eventually other systems)	2015-04-19 21:02:22 +00:00
MultiDiskFileSelector.Designer.cs	Multi-disk Bundler: Fix DPI scaling issues and improve control positioning.	2016-12-15 15:06:35 -05:00
MultiDiskFileSelector.cs	Multi-disk Bundler: Fix DPI scaling issues and improve control positioning.	2016-12-15 15:06:35 -05:00
MultiDiskFileSelector.resx	progress on MultiDiskBundler	2015-04-19 22:34:08 +00:00