Changeset 5961 in orxonox.OLD for branches/avi_play/src/lib/particles

Timestamp:

Dec 7, 2005, 2:53:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

Location:

branches/avi_play/src/lib/particles

Files:

• particle_engine.h (modified) (1 diff)
• particle_system.cc (modified) (1 diff)

branches/avi_play/src/lib/particles/particle_engine.h

@@ -12 +12 @@
 #include "particle_emitter.h"
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 
 // FORWARD DECLARATION

branches/avi_play/src/lib/particles/particle_system.cc

@@ -30 +30 @@
 #include "shell_command.h"
 
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 
 CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);