Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

6b35aab7

Commit 6b35aab7 authored 3 years ago by Fabian Tërnava

Downloads
- Plain Diff

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

# Conflicts:
#	source/RobotAPI/libraries/aron/core/CMakeLists.txt

parents 715e6727 d50c8157

No related branches found

No related tags found

2 merge requests!140armem/dev -> master,!136Memory structure changes, query_proc structure changes (Base classes / templated)

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/core/CMakeLists.txt 18 additions, 4 deletions

source/RobotAPI/libraries/aron/core/CMakeLists.txt
source/RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/serializer/ndarray/PCLPointCloud.cpp 3 additions, 0 deletions

...rator/codeWriter/cpp/serializer/ndarray/PCLPointCloud.cpp
source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/Reader.cpp 48 additions, 4 deletions

...braries/aron/core/codegenerator/typeReader/xml/Reader.cpp
source/RobotAPI/libraries/aron/core/codegenerator/typeReader/xml/Reader.h 9 additions, 1 deletion

...libraries/aron/core/codegenerator/typeReader/xml/Reader.h
source/RobotAPI/libraries/aron/core/navigator/type/ndarray/PCLPointCloud.h 2 additions, 1 deletion

...ibraries/aron/core/navigator/type/ndarray/PCLPointCloud.h
source/RobotAPI/libraries/aron/core/test/CMakeLists.txt 10 additions, 8 deletions

source/RobotAPI/libraries/aron/core/test/CMakeLists.txt
source/RobotAPI/libraries/core/pcl_point_types.h 63 additions, 0 deletions

source/RobotAPI/libraries/core/pcl_point_types.h

with 153 additions and 18 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