Changeset 9667 for code/trunk/src/modules/docking/Dock.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/modules/docking/Dock.cc
r8858 r9667 46 46 namespace orxonox 47 47 { 48 CreateFactory(Dock);48 RegisterClass(Dock); 49 49 50 50 SetConsoleCommand("Dock", "dock", &Dock::cmdDock).addShortcut().setAsInputCommand(); … … 53 53 registerStaticNetworkFunction(Dock::showDockingDialog); 54 54 55 Dock::Dock( BaseObject* creator) : StaticEntity(creator)55 Dock::Dock(Context* context) : StaticEntity(context) 56 56 { 57 57 RegisterObject(Dock);
Note: See TracChangeset
for help on using the changeset viewer.