![]() This doesn't compile because of Input.cs, didn't know what to do. Also search for Merge TODO for some commenting things that probably need to be deleted # Conflicts: # BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj # BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs # BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs # BizHawk.Client.EmuHawk/Program.cs # BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs # BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs # BizHawk.Client.EmuHawk/tools/ToolHelpers.cs # BizHawk.Client.EmuHawk/tools/ToolManager.cs # BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs # BizHawk.Client.EmuHawk/tools/TraceLogger.cs # BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs # BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs # BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs |
||
---|---|---|
.. | ||
BizHawk.Bizware.BizwareGL.GdiPlus.csproj | ||
BizHawk.Bizware.BizwareGL.GdiPlus.csproj.DotSettings | ||
GLControlWrapper_GdiPlus.cs | ||
GdiPlusGuiRenderer.cs | ||
IGL_GdiPlus.cs |