Changeset 258 for code/trunk/src/orxonox/orxonox.cc

Timestamp:

Nov 26, 2007, 4:26:17 PM (16 years ago)

Author:

landauf

Message:

merged object-hierarchy back to trunk

Location:

code/trunk/src/orxonox

Files:

• . (copied) (copied from code/branches/objecthierarchie/src/orxonox)
• orxonox.cc (moved) (moved from code/trunk/src/orxonox.cc) (2 diffs)

code/trunk/src/orxonox/orxonox.cc

@@ -39 +39 @@
 #include <iostream>
 
-#include "xml/xmlParser.h"
-#include "loader/LevelLoader.h"
+#include "../xml/xmlParser.h"
+#include "../loader/LevelLoader.h"
 
 
@@ -194 +194 @@
       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }
-    
+
     void setupScene()
     {