Sappharad ee84e5981c Merge remote-tracking branch 'origin/1.x' into mono-portable ... # Conflicts: # BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs # libmupen64plus/mupen64plus-win32-deps # libsnes/bsnes/target-libsnes/libsnes_pwrap.cpp		2019-10-03 21:33:28 -05:00
..
VersionInfo.cs	update release info	2018-06-09 17:55:28 +03:00
dummy.cs	Version: add a dummy source file so that some versions of csc.exe won't give error 2008, killing the build scripts	2017-02-24 14:03:12 +03:00
subwcrev.sh	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
svnrev_template	get (and use) shorthash	2015-06-24 21:44:03 -05:00
version.csproj	Merge branch 'master' into mono-portable	2017-03-14 20:36:35 -05:00