Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

a333aa5d

Commit a333aa5d authored 4 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev

parents 4096f771 2683f4b9

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/ArmarXObjects/CMakeLists.txt 11 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml 109 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
source/RobotAPI/libraries/ArmarXObjects/aron_conversions.cpp 168 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/aron_conversions.cpp
source/RobotAPI/libraries/ArmarXObjects/aron_conversions.h 15 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/aron_conversions.h

with 303 additions and 0 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