- Timestamp:
- May 26, 2016, 4:38:51 PM (8 years ago)
- Location:
- code/branches/presentationFS16
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS16
- Property svn:mergeinfo changed
/code/branches/plehmannFS16 (added) merged: 11137,11141,11152,11165,11167,11172,11178-11179,11183,11187,11190,11204
- Property svn:mergeinfo changed
-
code/branches/presentationFS16/src/orxonox/controllers/CMakeLists.txt
r11052 r11207 5 5 ArtificialController.cc 6 6 AIController.cc 7 ScriptController.cc8 7 WaypointController.cc 9 8 WaypointPatrolController.cc … … 19 18 FightingController.cc 20 19 MasterController.cc 20 NewScriptController.cc 21 21 ) 22 ADD_SUBDIRECTORY(scriptTasks)
Note: See TracChangeset
for help on using the changeset viewer.