Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

4a4a9e57

Commit 4a4a9e57 authored 3 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

parents 4f157d9b dce4402d

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 8 additions, 8 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
source/RobotAPI/libraries/ArmarXObjects/json_conversions.h 9 additions, 9 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.h
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 6 additions, 11 deletions

...otAPI/libraries/armem_objects/server/instance/Segment.cpp

with 23 additions and 28 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