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
ed3bf0e62b
Fix mixed line endings.
2017-04-15 15:53:02 -04:00
49b7ff4cc2
Revert "yabause tracer"
...
This reverts commit 6e0b8e2784
2016-08-23 21:31:42 -05:00
6e0b8e2784
yabause tracer
2016-08-24 00:05:17 +03:00
e379b0342e
probably final prettification for tracer
2016-08-21 23:52:42 +03:00
3435e5f70e
psx tracer - probably fix crash due to disposed delegate (didnt test)
2016-08-21 15:27:31 -05:00
00d77a4253
psx tracer: tiny cleanup
2016-08-21 22:37:35 +03:00
91fd016868
setup psx tracer because why not
...
arguments string doesn't arrive for some reason, otherwise all looks good
move psx disasm functionality to separate files (disassembler doesn't do anything yet)
2016-08-21 21:19:48 +03:00
Sappharad