Changeset 9667 for code/trunk/src/orxonox/Scene.cc
- 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/orxonox/Scene.cc
r9348 r9667 51 51 namespace orxonox 52 52 { 53 CreateFactory(Scene);54 55 Scene::Scene( BaseObject* creator) : BaseObject(creator), Synchronisable(creator)53 RegisterClass(Scene); 54 55 Scene::Scene(Context* context) : BaseObject(context), Synchronisable(context), Context(context) 56 56 { 57 57 RegisterObject(Scene);
Note: See TracChangeset
for help on using the changeset viewer.