# 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 |
||
|---|---|---|
| .. | ||
| DisplayManager | ||
| Extensions | ||
| Input | ||
| Properties | ||
| Resources | ||
| images | ||
| movie | ||
| App.config | ||
| BizHawk.Client.MultiHawk.csproj | ||
| EmulatorWindow.Designer.cs | ||
| EmulatorWindow.cs | ||
| EmulatorWindow.resx | ||
| EmulatorWindowList.cs | ||
| GlobalWin.cs | ||
| InputManager.cs | ||
| Mainform.Designer.cs | ||
| Mainform.cs | ||
| Mainform.resx | ||
| PresentationPanel.cs | ||
| Program.cs | ||