Changeset 9667 for code/trunk/src/orxonox/LevelManager.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/LevelManager.cc (modified) (2 diffs)

code/trunk/src/orxonox/LevelManager.cc

@@ -37 +37 @@
 
 #include "util/ScopedSingletonManager.h"
+#include "core/config/CommandLineParser.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
 #include "core/ClassTreeMask.h"
-#include "core/CommandLineParser.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/CoreIncludes.h"
 #include "core/Loader.h"
 #include "core/Resource.h"
@@ -59 +59 @@
     LevelManager::LevelManager()
     {
-        RegisterRootObject(LevelManager);
+        RegisterObject(LevelManager);
         this->setConfigValues();