Skip to content
Snippets Groups Projects
Commit d19cdc17 authored by ArmarX User's avatar ArmarX User
Browse files

Merge branch 'master' into kitgripper 

# Conflicts:
#	source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
#	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp
#	source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
#	source/RobotAPI/interface/CMakeLists.txt
#	source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice
#	source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
#	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp
parents efa2917d 4893ffdd
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 754 additions and 290 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment