otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Removed merge conflict tag from gui.cpp

Browse source
This commit is contained in:
ZeroByteOrg 2022-05-27 13:00:23 -05:00
parent 8af85096ff
commit 0846f66a7e
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/gui.cpp
View file

@ -2732,13 +2732,10 @@ bool FurnaceGUI::loop() {
midiLock.unlock(); midiLock.unlock();
} }
<<<<<<< HEAD
eventTimeEnd=SDL_GetPerformanceCounter(); eventTimeEnd=SDL_GetPerformanceCounter();
layoutTimeBegin=SDL_GetPerformanceCounter(); layoutTimeBegin=SDL_GetPerformanceCounter();
=======
>>>>>>> Commander X16 file export: ZSM format
ImGui_ImplSDLRenderer_NewFrame(); ImGui_ImplSDLRenderer_NewFrame();
ImGui_ImplSDL2_NewFrame(sdlWin); ImGui_ImplSDL2_NewFrame(sdlWin);
ImGui::NewFrame(); ImGui::NewFrame();