![]() 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 |
||
---|---|---|
.. | ||
BlipBuffer.cs | ||
DCFilter.cs | ||
ISynchronizingAudioBuffer.cs | ||
Metaspu.cs | ||
SpeexResampler.cs | ||
Waves.cs |