Skip to content
Snippets Groups Projects
Commit 6344efed authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'master' into armem/dev 

# Conflicts:
#	source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
#	source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
#	source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
#	source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
#	source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
#	source/RobotAPI/libraries/armem/CMakeLists.txt
#	source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
parents 82218704 1a711741
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 237 additions and 112 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment