Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

13299ac5

Commit 13299ac5 authored 3 months ago by Timo Birr

Downloads
- Plain Diff

Merge branch 'master' of git.h2t.iar.kit.edu:/sw/armarx/robot-api

parents 28adc197 db1c599c

No related branches found

No related tags found

1 merge request!496Feature/skill manager stop all

Changes 3

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp 4 additions, 4 deletions

...es/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp 302 additions, 132 deletions

...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.h 30 additions, 2 deletions

...braries/armem_grasping/server/KnownGraspProviderSegment.h

with 336 additions and 138 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