Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/importer/framework.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/importer/framework.h (modified) (2 diffs)

orxonox/branches/nico/src/importer/framework.h

@@ -3 +3 @@
  
 #include "windowHandler.h" // Include the Whandler Basecode
-#include "object.h"
+#include "objModel.h"
 #include "vector.h"
 
@@ -33 +33 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-Object* obj;
+OBJModel* obj;