Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api
Conflicts: CMakeLists.txt
No related branches found
No related tags found
Showing
- CMakeLists.txt 4 additions, 4 deletionsCMakeLists.txt
- etc/cmake/UseRobotAPI.cmake 1 addition, 0 deletionsetc/cmake/UseRobotAPI.cmake
- interface/CMakeLists.txt 1 addition, 1 deletioninterface/CMakeLists.txt
- scenarios/MovePlatformTest/configs/MovePlatformExample.xml 3 additions, 3 deletionsscenarios/MovePlatformTest/configs/MovePlatformExample.xml
- scenarios/MovePlatformTest/configs/MovePlatformExampleCloseToTable.xml 6 additions, 3 deletions...ePlatformTest/configs/MovePlatformExampleCloseToTable.xml
- scenarios/MovePlatformToLandmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml 1 addition, 1 deletion...ndmarkTest/configs/MovePlatformToLandmarkExampleGraph.xml
- source/RobotAPI/applications/ForceTorqueObserver/ForceTorqueObserverApp.h 1 addition, 1 deletion...applications/ForceTorqueObserver/ForceTorqueObserverApp.h
- source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h 1 addition, 1 deletionsource/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h
- source/RobotAPI/applications/HeadIKUnit/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/HeadIKUnit/main.cpp
- source/RobotAPI/applications/MotionControl/MotionControlApp.h 1 addition, 1 deletion...ce/RobotAPI/applications/MotionControl/MotionControlApp.h
- source/RobotAPI/applications/MotionControl/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/MotionControl/main.cpp
- source/RobotAPI/applications/MotionControlTest/MotionControlTestApp.h 1 addition, 1 deletion...API/applications/MotionControlTest/MotionControlTestApp.h
- source/RobotAPI/applications/MotionControlTest/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/MotionControlTest/main.cpp
- source/RobotAPI/applications/MovePlatform/MovePlatformApp.h 1 addition, 1 deletionsource/RobotAPI/applications/MovePlatform/MovePlatformApp.h
- source/RobotAPI/applications/MovePlatform/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/MovePlatform/main.cpp
- source/RobotAPI/applications/MovePlatformToLandmark/MovePlatformToLandmarkApp.h 1 addition, 1 deletion...ations/MovePlatformToLandmark/MovePlatformToLandmarkApp.h
- source/RobotAPI/applications/MovePlatformToLandmark/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/MovePlatformToLandmark/main.cpp
- source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h 1 addition, 1 deletion.../RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h
- source/RobotAPI/applications/TCPControlUnit/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/TCPControlUnit/main.cpp
- source/RobotAPI/core/RobotStatechartContext.cpp 1 addition, 1 deletionsource/RobotAPI/core/RobotStatechartContext.cpp
Loading
Please register or sign in to comment