Changeset 4017 in orxonox.OLD for orxonox/trunk/src/track_manager.h

Timestamp:

May 2, 2005, 10:49:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged particleSystem back into the Trunk
merged with command:
svn merge particleEngine/ ../trunk/ -r 3966:HEAD
U ../trunk/src/lib/graphics/particles/particle_emitter.cc
U ../trunk/src/lib/graphics/particles/particle_system.cc
U ../trunk/src/lib/graphics/particles/particle_system.h

as you can see, no conflicts

File:

• orxonox/trunk/src/track_manager.h (modified) (1 diff)

orxonox/trunk/src/track_manager.h

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