Changeset 6022 in orxonox.OLD for trunk/src/lib/collision_detection/cd_engine.h

Timestamp:

Dec 10, 2005, 8:33:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the NewModel branche back to the trunk.
merged with command
svn merge branches/newModel/ trunk/ -r 6016:HEAD
no conflicts

File:

• trunk/src/lib/collision_detection/cd_engine.h (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.h

@@ -10 +10 @@
 #include "base_object.h"
 #include "collision_defs.h"
-#include "abstract_model.h"
+#include "model.h"