Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

a4bb6da0

Commit a4bb6da0 authored 3 years ago by alissa

Downloads
- Patches
- Plain Diff

adapted to changes from master merge

parent a7132bd2

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.cpp 1 addition, 1 deletion

...rmem/client/GraspProviderExample/GraspProviderExample.cpp
source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.h 2 additions, 2 deletions

.../armem/client/GraspProviderExample/GraspProviderExample.h
source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp 3 additions, 3 deletions

...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp
source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.h 2 additions, 3 deletions

...obotAPI/components/armem/server/GraspMemory/GraspMemory.h
source/RobotAPI/interface/units/GraspCandidateProviderInterface.ice 1 addition, 0 deletions

...otAPI/interface/units/GraspCandidateProviderInterface.ice
source/RobotAPI/libraries/GraspingUtility/GraspCandidateReader.cpp 2 additions, 1 deletion

...botAPI/libraries/GraspingUtility/GraspCandidateReader.cpp
source/RobotAPI/libraries/GraspingUtility/GraspCandidateWriter.cpp 1 addition, 0 deletions

...botAPI/libraries/GraspingUtility/GraspCandidateWriter.cpp
source/RobotAPI/libraries/GraspingUtility/GraspCandidateWriter.h 1 addition, 1 deletion

...RobotAPI/libraries/GraspingUtility/GraspCandidateWriter.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