Changeset 6222 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/lib (modified) (1 prop)
• src/lib/collision_detection (modified) (1 prop)
• src/lib/collision_detection/cd_engine.cc (modified) (1 diff)
• src/lib/collision_detection/obb.cc (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -19 +19 @@
 #include "obb_tree.h"
 #include "debug.h"
-#include "list.h"
 
 #include "model.h"

trunk/src/lib/collision_detection/obb.cc

@@ -17 +17 @@
 
 #include "obb.h"
-#include "list.h"
 #include "vector.h"