Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

8fafa3f0

Commit 8fafa3f0 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/armem-object-memory-articulated-objects

parents f76f836f b02ec1c8

No related branches found

No related tags found

2 merge requests!157armem/dev => master,!141Feature/armem object memory articulated objects

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 5 additions, 0 deletions

source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
source/RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h 5 additions, 0 deletions

.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h
source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp 35 additions, 2 deletions

source/RobotAPI/libraries/armem/test/ArMemMemoryTest.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 1 addition, 1 deletion

...otAPI/libraries/armem_objects/server/instance/Segment.cpp

with 46 additions and 3 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