Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

741f4702

Commit 741f4702 authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

parents 5634f09b 79b9a18f

No related branches found

No related tags found

1 merge request!321Merge of all branches of Fabian PK (related to skills)

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/GraspingUtility/box_to_grasp_candidates.cpp 2 additions, 2 deletions

...API/libraries/GraspingUtility/box_to_grasp_candidates.cpp
source/RobotAPI/libraries/GraspingUtility/box_to_grasp_candidates.h 1 addition, 1 deletion

...otAPI/libraries/GraspingUtility/box_to_grasp_candidates.h
source/RobotAPI/libraries/GraspingUtility/grasp_candidate_drawer.cpp 4 additions, 2 deletions

...tAPI/libraries/GraspingUtility/grasp_candidate_drawer.cpp
source/RobotAPI/libraries/GraspingUtility/grasp_candidate_drawer.h 1 addition, 1 deletion

...botAPI/libraries/GraspingUtility/grasp_candidate_drawer.h
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp 3 additions, 3 deletions

...es/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h 2 additions, 2 deletions

...ries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h

with 13 additions and 11 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