Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Removed git tags <__<

Browse Source
This commit is contained in:
Tamir Atias 2012-01-15 17:07:51 +02:00
parent 200dcb15e9
commit 3e6076b724
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Unuk/Game.cpp
View File

@ -37,13 +37,8 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
_gameRenderTime.SetXY(10, 50);
_gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK);
<<<<<<< HEAD
_gameUpdateTime.SetXY(10, 70);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
=======
_gameUpdateTime.SetXY(10, 30);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
>>>>>>> 5269706e05ea3558838a6eaa330cd8cc53b3cd58
stringstream playerXYString;
_playerXY.SetXY(10, 90);