Changeset 9667 for code/trunk/src/orxonox/gametypes/Dynamicmatch.h
- 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.h
r9348 r9667 44 44 { 45 45 public: 46 Dynamicmatch( BaseObject* creator);46 Dynamicmatch(Context* context); 47 47 virtual ~Dynamicmatch() {} 48 48
Note: See TracChangeset
for help on using the changeset viewer.