Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

d110e9af

Commit d110e9af authored 3 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

parents e8552af6 9fc1fad7

Loading

This commit is part of merge request !226. Comments created here will be created in the context of that merge request.

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/common/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/aron/common/CMakeLists.txt
source/RobotAPI/libraries/aron/common/aron/FramedPose.xml 53 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/FramedPose.xml
source/RobotAPI/libraries/aron/common/aron/framed.xml 48 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/framed.xml
source/RobotAPI/libraries/aron/common/aron/time.xml 39 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/time.xml
source/RobotAPI/libraries/aron/common/aron_conversions/armarx.cpp 82 additions, 0 deletions

...obotAPI/libraries/aron/common/aron_conversions/armarx.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/armarx.h 16 additions, 0 deletions

.../RobotAPI/libraries/aron/common/aron_conversions/armarx.h

with 240 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