- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc
r8858 r9667 42 42 namespace orxonox 43 43 { 44 CreateFactory(BoxCollisionShape);44 RegisterClass(BoxCollisionShape); 45 45 46 46 /** … … 48 48 Constructor. Registers and initializes the object. 49 49 */ 50 BoxCollisionShape::BoxCollisionShape( BaseObject* creator) : CollisionShape(creator)50 BoxCollisionShape::BoxCollisionShape(Context* context) : CollisionShape(context) 51 51 { 52 52 RegisterObject(BoxCollisionShape);
Note: See TracChangeset
for help on using the changeset viewer.