Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

ef00e982

Commit ef00e982 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'armem/dev-fixes' into 'armem/dev'

Armem/dev fixes

See merge request ArmarX/RobotAPI!153

parents a320d66a fcb8e784

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 77 additions, 66 deletions

...raries/armem_objects/client/articulated_object/Reader.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 1 addition, 1 deletion

...raries/armem_objects/client/articulated_object/Writer.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h 1 addition, 1 deletion

...ibraries/armem_objects/client/articulated_object/Writer.h
source/RobotAPI/libraries/armem_robot/robot_conversions.cpp 3 additions, 3 deletions

source/RobotAPI/libraries/armem_robot/robot_conversions.cpp

with 82 additions and 71 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment