Changeset e1eec78 in opengl-game

Timestamp:

Oct 24, 2018, 2:48:21 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

f71d87d

Parents:

3d96d13

git-author:

Dmitry Portnoy <dmp1488@…> (10/24/18 02:48:04)

git-committer:

Dmitry Portnoy <dmp1488@…> (10/24/18 02:48:21)

Message:

Finish resolving merge conflict

File:

• new-game.cpp (modified) (1 diff)

new-game.cpp

@@ -2298 +2298 @@
          ImGuiWindowFlags_NoResize |
          ImGuiWindowFlags_NoMove);
-<<<<<<< HEAD
       ImGui::Text(ssScore.str().c_str());
       ImGui::Text(ssFps.str().c_str());
-=======
-      ImGui::Text("Score: ???");
-      ImGui::Text("FPS:   %f", fps);
->>>>>>> 446e55df316c547047dc0eb5c46189c6958dba21
       ImGui::End();
    }