Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

5be6b7fd

Commit 5be6b7fd authored 6 months ago by Robin Müller

Downloads
- Plain Diff

Merge branch 'master' into feature/MongoDB

parents 70ed32b5 330ac3f5

No related branches found

No related tags found

1 merge request!464Draft: Feature/mongo db

Checking pipeline status

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 1 addition, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 29 additions, 5 deletions

...es/armem_robot_state/client/common/VirtualRobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 9 additions, 0 deletions

...ries/armem_robot_state/client/common/VirtualRobotReader.h

with 39 additions and 6 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