Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

b8febae4

Commit b8febae4 authored 8 months ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

parents a7165c2b 099857de

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp 23 additions, 2 deletions

source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
source/RobotAPI/libraries/armem/mns/Registry.cpp 1 addition, 1 deletion

source/RobotAPI/libraries/armem/mns/Registry.cpp
source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp 9 additions, 3 deletions

source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp
source/RobotAPI/libraries/armem/server/plugins/Plugin.h 1 addition, 0 deletions

source/RobotAPI/libraries/armem/server/plugins/Plugin.h
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.cpp 23 additions, 14 deletions

.../libraries/armem_objects/client/instance/ObjectReader.cpp
source/RobotAPI/libraries/armem_objects/client/instance/ObjectReader.h 6 additions, 4 deletions

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

with 63 additions and 24 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