Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

0c6b6751

Commit 0c6b6751 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents ad7a2e38 a10bf775

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 7 additions, 0 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 1 addition, 1 deletion

...gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
source/RobotAPI/libraries/armem_grasping/aron/KnownGraspCandidate.xml 11 additions, 8 deletions

...API/libraries/armem_grasping/aron/KnownGraspCandidate.xml
source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp 3 additions, 3 deletions

...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
source/RobotAPI/libraries/armem_objects/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/armem_objects/CMakeLists.txt
source/RobotAPI/libraries/armem_objects/client/instance/ObjectWriter.cpp 81 additions, 0 deletions

.../libraries/armem_objects/client/instance/ObjectWriter.cpp
source/RobotAPI/libraries/armem_objects/client/instance/ObjectWriter.h 67 additions, 0 deletions

...PI/libraries/armem_objects/client/instance/ObjectWriter.h

with 172 additions and 12 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