Skip to content
Snippets Groups Projects
Commit 39fd230a authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into aron/dev 

# Conflicts:
#	source/RobotAPI/components/armem/CMakeLists.txt
#	source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
#	source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Orientation.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Pose.cpp
#	source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/Position.cpp
parents a60f1838 b69bcf24
Hide whitespace changes
Inline Side-by-side
Showing
with 627 additions and 103 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