Changeset 9406 in orxonox.OLD for trunk/src/subprojects/collision_detection

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/subprojects/collision_detection/collision_test_entity.cc (modified) (1 diff)

trunk/src/subprojects/collision_detection/collision_test_entity.cc

@@ -25 +25 @@
 #include "util/loading/factory.h"
 
-using namespace std;
+
 CREATE_FACTORY(CollisionTestEntity, CL_ENVIRONMENT);