- Timestamp:
- Dec 11, 2018, 2:52:30 PM (5 years ago)
- Location:
- code/branches/Merge_HS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Merge_HS18
- Property svn:mergeinfo changed
/code/branches/WorldMap_HS18 (added) merged: 12036,12053-12055,12058-12060,12101,12106,12110,12131,12151-12152,12166
- Property svn:mergeinfo changed
-
code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt
r12028 r12180 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 2 Controller.cc 3 StoryModeController.cc 4 SMCoord.cc 3 5 HumanController.cc 4 6 NewHumanController.cc … … 20 22 MasterController.cc 21 23 ArrowController.cc; 22 AutonomousDroneController.cc; 24 AutonomousDroneController.cc; 25 StoryModeController.cc; 23 26 24 27 )
Note: See TracChangeset
for help on using the changeset viewer.