Changeset 11681 for code/branches/Presentation_HS17/src/orxonox/infos
- Timestamp:
- Dec 16, 2017, 1:32:02 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/orxonox/infos/Bot.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17
- Property svn:mergeinfo changed
/code/branches/CampaignMap_HS17 (added) merged: 11458,11507,11512-11513,11525-11527,11544-11545,11560,11564,11584,11588,11605,11634,11636,11663,11675-11676
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17/src/orxonox/infos/Bot.cc
r11358 r11681 77 77 "Thomas the Tankengine", 78 78 "Rick", 79 "send nudes", 79 80 "Morty", 80 81 "Charlie the Unicorn",
Note: See TracChangeset
for help on using the changeset viewer.
