Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

55a7a436

Commit 55a7a436 authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into 67-split-armem-into-core-and-server-lib

# Conflicts:
#	source/RobotAPI/libraries/armem_gui/CMakeLists.txt

parents eee78855 81bc20ba

No related branches found

No related tags found

1 merge request!202Resolve "Split armem into core and server lib"

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem_gui/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/libraries/armem_gui/CMakeLists.txt
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 34 additions, 30 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 1 addition, 1 deletion

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

with 36 additions and 31 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