Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

5ec526e4

Commit 5ec526e4 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/armem/dev' into feature/armem-robot-state-memory-update

parents 3b04ab9e 51ce19a1

No related branches found

No related tags found

2 merge requests!157armem/dev => master,!144robot state memory update

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 28 additions, 45 deletions

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 1 addition, 1 deletion

...raries/armem_objects/client/articulated_object/Reader.cpp

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