Changeset 3196 for code/trunk/src/orxonox/objects/gametypes/Gametype.h
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/gametypes/Gametype.h
r3033 r3196 33 33 34 34 #include <map> 35 #include <set> 36 #include <string> 35 37 36 38 #include "core/BaseObject.h" 37 39 #include "core/Identifier.h" 38 #include "objects/worldentities/ControllableEntity.h" 39 #include "objects/Tickable.h" 40 #include "interfaces/Tickable.h" 40 41 #include "objects/infos/GametypeInfo.h" 41 42
Note: See TracChangeset
for help on using the changeset viewer.