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

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

* origin/master:
  Ensure Pose() constructs an Identity pose
  Moved include to cpp
  Fixed unused param warnings
  fixed the error of the controller
  added serial driver that works under 14.04, the default pip serial package is broken
  Fixed Logging::startRtLoggingWithAliasNames null pointer issue
  modified dmptscontroller
parents 4e8c03c0 b96c3dbd
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 124 additions and 191 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