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

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI 

* 'master' of https://gitlab.com/ArmarX/RobotAPI:
  HapticObserver: Don't crash on reception of empty matrices
  fixed simox dependency search and includes
  fixed wrong data type causing exception
parents 3e8fb106 582b3b2b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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