Changeset 12016 for code/branches/PresentationFS18/src/orxonox/controllers
- Timestamp:
- May 30, 2018, 2:37:02 PM (6 years ago)
- Location:
- code/branches/PresentationFS18
- Files:
-
- 3 edited
- 2 copied
-
. (modified) (1 prop)
-
src/orxonox/controllers/AutonomousDroneController.cc (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.cc)
-
src/orxonox/controllers/AutonomousDroneController.h (copied) (copied from code/branches/ScriptableController_FS18/src/orxonox/controllers/AutonomousDroneController.h)
-
src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/controllers/Controller.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/PresentationFS18
- Property svn:mergeinfo changed
-
code/branches/PresentationFS18/src/orxonox/controllers/CMakeLists.txt
r11783 r12016 19 19 FightingController.cc 20 20 MasterController.cc 21 ArrowController.cc 21 ArrowController.cc; 22 AutonomousDroneController.cc; 23 22 24 ) -
code/branches/PresentationFS18/src/orxonox/controllers/Controller.cc
r11071 r12016 26 26 * 27 27 */ 28 28 //asdf 29 29 #include "Controller.h" 30 30 #include "core/CoreIncludes.h"
Note: See TracChangeset
for help on using the changeset viewer.
