gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing merge

This commit is contained in:
Andre Antunes 2011-04-07 05:48:10 -03:00
parent 67f37ccb51
commit ee2b05dc8d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/framework/engine.cpp
View File

@ -108,7 +108,6 @@ void Engine::run()
// swap buffers // swap buffers
Platform::swapBuffers(); Platform::swapBuffers();
<<<<<<< HEAD
/* /*
static ConnectionPtr connection = g_connections.createConnection(); static ConnectionPtr connection = g_connections.createConnection();
@ -127,9 +126,7 @@ void Engine::run()
} }
*/ */
//} //}
=======
} }
>>>>>>> f3eaf3f7262bf6ef35cee745d40088669526125a
} }
m_stopping = false; m_stopping = false;