Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

23c3e858

Commit 23c3e858 authored 1 year ago by ARMAR-DE

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/framedBoxedLocations

parents e5dea72c 84426201

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp 2 additions, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp
source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp 16 additions, 17 deletions

...RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp 43 additions, 67 deletions

...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/framed.cpp 1 addition, 0 deletions

...obotAPI/libraries/aron/common/aron_conversions/framed.cpp
source/RobotAPI/libraries/skills/provider/SkillProviderComponentPlugin.cpp 1 addition, 1 deletion

...ibraries/skills/provider/SkillProviderComponentPlugin.cpp

with 63 additions and 86 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