Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

4c327ae4

Commit 4c327ae4 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into armem/dev

# Conflicts:
#	source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp

parents 4397230b 2023881a

No related branches found

No related tags found

1 merge request!188ArMem Updates

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/client/util/SimpleWriterBase.cpp 3 additions, 1 deletion

...RobotAPI/libraries/armem/client/util/SimpleWriterBase.cpp
source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp 2 additions, 1 deletion

...braries/armem_robot_state/server/localization/Segment.cpp

with 5 additions and 2 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