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

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/lib/collision_detection/Makefile.am (modified) (1 diff)

trunk/src/lib/collision_detection/Makefile.am

@@ -6 +6 @@
 libORXcd_a_SOURCES = cd_engine.cc \
                      collision.cc \
-                     obb.cc \
+                     obb.cc \
                      obb_tree.cc \
-                     obb_tree_node.cc \
+                     obb_tree_node.cc \
                      bv_tree.cc \
-                     bv_tree_node.cc \
-                     bounding_volume.cc \
-                     bounding_sphere.cc
+                     bv_tree_node.cc \
+                     bounding_volume.cc \
+                     bounding_sphere.cc
 
 
 noinst_HEADERS =     cd_engine.h \
-                     collision_defs.h \
+                     collision_defs.h \
                      collision.h \
-                     obb.h \
+                     obb.h \
                      obb_tree.h \
-                     obb_tree_node.h \
+                     obb_tree_node.h \
                      bv_tree.h \
-                     bv_tree_node.h \
-                     bounding_volume.h \
-                     bounding_sphere.h
+                     bv_tree_node.h \
+                     bounding_volume.h \
+                     bounding_sphere.h