Raphael Grimm
authored
Conflicts: source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.cpp source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.h source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceDMPController.cpp source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceDMPController.h
| Name | Last commit | Last update |
|---|---|---|
| build | ||
| data | ||
| etc | ||
| scenarios | ||
| source | ||
| .gitignore | ||
| CMakeLists.txt | ||
| README.txt | ||
| gpl-2.0.txt |