Skip to content
Snippets Groups Projects
Commit 47d9753f authored by Mirko Wächter's avatar Mirko Wächter
Browse files

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

* origin/master:
  reverted cmake
  modified dmpcontroller
  Remove .orig files
  Fix dependency of RobotAPINjointControllers to MMM
  Use '#pragma once' instead of include guards
  modified dmpcontroller
  finished coding njointccdmpcontroller
  fixed building; added njointccdmpcontroller
  added njointtsdmpcontroller
parents 0e87721a 593ba3d5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 60 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