BizHawk/BizHawk.Client.DiscoHawk
Sappharad 7f5aa0ae77 Merge branch 'master' into mono-portable
Conflicts:
	.gitignore
	BizHawk.Client.Common/PathManager.cs
	BizHawk.Client.Common/lua/LuaSandbox.cs
	BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
	BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs
	BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
	BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
	BizHawk.Client.EmuHawk/GLManager.cs
	BizHawk.Client.EmuHawk/Program.cs
	BizHawk.Client.EmuHawk/movie/EditSubtitlesForm.cs
	BizHawk.Client.EmuHawk/movie/PlayMovie.cs
	BizHawk.Emulation.Common/Sound/Utilities/SpeexResampler.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi_CMD.cs
	BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
	BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.ITraceable.cs
	BizHawk.Emulation.Cores/LibretroOld/LibRetro.cs
	Version/VersionInfo.cs
	libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp
2017-05-02 20:38:56 -05:00
..
Properties Emulation.Common cleanups 2017-04-27 11:37:26 -05:00
About.Designer.cs some more DiscoHawk reorg 2013-11-03 13:19:36 +00:00
About.cs some more DiscoHawk reorg 2013-11-03 13:19:36 +00:00
About.resx import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
AudioExtractor.cs refactor discstructure mightily 2015-07-11 13:46:55 -05:00
BizHawk.Client.DiscoHawk.csproj Merge branch 'master' into mono-portable 2016-03-07 20:34:23 -06:00
ComparisonResults.Designer.cs import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
ComparisonResults.cs import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
ComparisonResults.resx import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
DiscoHawk.cs Merge branch 'master' into mono-portable 2017-03-14 20:36:35 -05:00
DiscoHawkDialog.Designer.cs Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00
DiscoHawkDialog.cs import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
DiscoHawkDialog.resx Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00
MainDiscoForm.Designer.cs import WIP discsys work from svn 2015-06-23 13:57:11 -05:00
MainDiscoForm.cs improve discohawk reliability 2015-09-10 16:54:02 -05:00
MainDiscoForm.resx Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00
ProgressDialog.Designer.cs Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00
ProgressDialog.cs move disc stuff out of BizHawk.Emulation into a new project BizHawk.Emulation.DiscSystem, updated namesspaces in those files, set up other projects with the right references and usings 2013-11-03 23:45:44 +00:00
ProgressDialog.resx Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00
discohawk.ico Chane discoHawk namespace, folder, and project naming scheme to BizHawk.Client.DiscoHawk 2013-11-03 12:28:33 +00:00