Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/track_manager.h

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/track_manager.h (modified) (1 diff)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/track_manager.h

@@ -153 +153 @@
   static TrackManager* getInstance(void);
 
+  TrackManager(TiXmlElement* root);
+
   // Methods to change the Path (initialisation)
   void workOn(unsigned int trackID);

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+