- Timestamp:
- Feb 18, 2018, 6:42:50 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 2 edited
- 6 copied
-
. (modified) (1 prop)
-
src/orxonox/controllers/ArrowController.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/ArrowController.cc)
-
src/orxonox/controllers/ArrowController.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/ArrowController.h)
-
src/orxonox/controllers/AutonomousDroneController.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.cc)
-
src/orxonox/controllers/AutonomousDroneController.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/AutonomousDroneController.h)
-
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/controllers/WaypointArrow.cc (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.cc)
-
src/orxonox/controllers/WaypointArrow.h (copied) (copied from code/branches/Waypoints_HS17/src/orxonox/controllers/WaypointArrow.h)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge
- Property svn:mergeinfo changed
/code/branches/Waypoints_HS17 (added) merged: 11496,11523,11539,11559,11582,11603,11633,11655,11657,11659,11661,11687
- Property svn:mergeinfo changed
-
code/branches/Presentation_HS17_merge/src/orxonox/controllers/CMakeLists.txt
r11052 r11774 19 19 FightingController.cc 20 20 MasterController.cc 21 AutonomousDroneController.cc 22 ArrowController.cc 21 23 )
Note: See TracChangeset
for help on using the changeset viewer.
