Changeset 9667 for code/trunk/src/orxonox/gametypes/Dynamicmatch.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/gametypes/Dynamicmatch.cc
r9348 r9667 54 54 #include "worldentities/pawns/Pawn.h" 55 55 #include "worldentities/pawns/SpaceShip.h" 56 #include "core/ ConfigValueIncludes.h"56 #include "core/config/ConfigValueIncludes.h" 57 57 #include "interfaces/TeamColourable.h" 58 58 #include "items/Engine.h" … … 62 62 namespace orxonox 63 63 { 64 CreateUnloadableFactory(Dynamicmatch);65 66 Dynamicmatch::Dynamicmatch( BaseObject* creator) : Gametype(creator)64 RegisterUnloadableClass(Dynamicmatch); 65 66 Dynamicmatch::Dynamicmatch(Context* context) : Gametype(context) 67 67 { 68 68 RegisterObject(Dynamicmatch);
Note: See TracChangeset
for help on using the changeset viewer.