[Orxonox-commit 2726] r7431 - code/trunk/src/orxonox

rgrieder at orxonox.net rgrieder at orxonox.net
Sun Sep 12 18:58:10 CEST 2010


Author: rgrieder
Date: 2010-09-12 18:58:10 +0200 (Sun, 12 Sep 2010)
New Revision: 7431

Modified:
   code/trunk/src/orxonox/Main.cc
Log:
Merged another change from sandbox_qt to the trunk. Almost insignificant...

Modified: code/trunk/src/orxonox/Main.cc
===================================================================
--- code/trunk/src/orxonox/Main.cc	2010-09-12 16:52:54 UTC (rev 7430)
+++ code/trunk/src/orxonox/Main.cc	2010-09-12 16:58:10 UTC (rev 7431)
@@ -33,14 +33,13 @@
     The main function of Orxonox (but not the entry point of the program!)
 */
 
-#include "OrxonoxPrereqs.h"
+#include "Main.h"
 
 #include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/LuaState.h"
 #include "ToluaBindOrxonox.h"
 #include "ToluaBindNetwork.h"
-#include "Main.h"
 
 DeclareToluaInterface(Orxonox);
 DeclareToluaInterface(Network);




More information about the Orxonox-commit mailing list