Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

512b9464

Commit 512b9464 authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into armem/dev

parents b6addcda 3f81a7e3

No related branches found

No related tags found

1 merge request!120armem/dev

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp 7 additions, 1 deletion

...its/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp 23 additions, 0 deletions

...s/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 38 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 26 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
source/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp 5 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectID.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectID.h 2 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectID.h
source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 47 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 16 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h

with 164 additions and 1 deletion

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