Changeset 7758 for code/branches/network5/src/orxonox/gametypes/Gametype.h
- Timestamp:
- Dec 12, 2010, 11:13:01 PM (13 years ago)
- Location:
- code/branches/network5
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network5
- Property svn:mergeinfo changed
/code/branches/network3 (added) merged: 7333,7336-7337,7344 /code/branches/network4 (added) merged: 7497,7718,7753-7755
- Property svn:mergeinfo changed
-
code/branches/network5/src/orxonox/gametypes/Gametype.h
r7284 r7758 184 184 // Config Values 185 185 std::string scoreboardTemplate_; 186 187 /* HACK HACK HACK */ 188 ConsoleCommand* dedicatedAddBots_; 189 ConsoleCommand* dedicatedKillBots_; 190 /* HACK HACK HACK */ 186 191 }; 187 192 }
Note: See TracChangeset
for help on using the changeset viewer.