Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

2312e7e6

Commit 2312e7e6 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'fix/armem_robot_state' into 'master'

Fix/armem robot state

See merge request ArmarX/RobotAPI!194

parents 8167340d b535f3bf

No related branches found

No related tags found

2 merge requests!194Fix/armem robot state,!135Resolve "Add Grasp (Affordance) Memory"

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 2 additions, 2 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 4 additions, 2 deletions

...es/armem_robot_state/client/common/VirtualRobotReader.cpp

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