Changeset 5955 in orxonox.OLD for branches/powerups/src/lib/particles

Timestamp:

Dec 7, 2005, 1:05:10 PM (19 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

Location:

branches/powerups/src/lib/particles

Files:

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

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

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

branches/powerups/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);