Skip to content
Snippets Groups Projects
Commit fef7819d authored by Raphael Grimm's avatar Raphael Grimm
Browse files

Merge remote-tracking branch 'origin/master' into RobotUnit_v3 

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
parents a4fc6c3c 7c464ec9
No related branches found
No related tags found
1 merge request!39Robot unit v3
Hide whitespace changes
Inline Side-by-side
Showing
with 381 additions and 609 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