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

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

File:

• branches/powerups/src/lib/physics/physics_engine.cc (modified) (1 diff)

branches/powerups/src/lib/physics/physics_engine.cc

@@ -20 +20 @@
 #include "class_list.h"
 #include "list.h"
-#include "tinyxml.h"
+#include "parser/tinyxml/tinyxml.h"
 #include "factory.h"
 #include "load_param.h"