Merge branch 'armem/dev' into feature/diskMemory
# Conflicts: # source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp # source/RobotAPI/libraries/aron/core/CMakeLists.txt
No related branches found
No related tags found
Showing
- source/RobotAPI/components/ArViz/Client/elements/ElementOps.h 5 additions, 0 deletions...ce/RobotAPI/components/ArViz/Client/elements/ElementOps.h
- source/RobotAPI/libraries/armem/core/Time.h 1 addition, 1 deletionsource/RobotAPI/libraries/armem/core/Time.h
- source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp 88 additions, 19 deletions...otAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
- source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.h 10 additions, 5 deletions...obotAPI/libraries/armem_robot_mapping/MappingDataReader.h
- source/RobotAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp 54 additions, 45 deletions...otAPI/libraries/armem_robot_mapping/MappingDataWriter.cpp
- source/RobotAPI/libraries/armem_robot_mapping/aron/LaserScan.xml 8 additions, 28 deletions...RobotAPI/libraries/armem_robot_mapping/aron/LaserScan.xml
- source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.cpp 27 additions, 66 deletions...botAPI/libraries/armem_robot_mapping/aron_conversions.cpp
- source/RobotAPI/libraries/armem_robot_mapping/aron_conversions.h 21 additions, 7 deletions...RobotAPI/libraries/armem_robot_mapping/aron_conversions.h
- source/RobotAPI/libraries/armem_robot_mapping/types.h 2 additions, 2 deletionssource/RobotAPI/libraries/armem_robot_mapping/types.h
- source/RobotAPI/libraries/aron/converter/CMakeLists.txt 15 additions, 0 deletionssource/RobotAPI/libraries/aron/converter/CMakeLists.txt
- source/RobotAPI/libraries/aron/converter/common/CMakeLists.txt 23 additions, 0 deletions...e/RobotAPI/libraries/aron/converter/common/CMakeLists.txt
- source/RobotAPI/libraries/aron/converter/common/Converter.cpp 1 addition, 0 deletions...ce/RobotAPI/libraries/aron/converter/common/Converter.cpp
- source/RobotAPI/libraries/aron/converter/common/Converter.h 71 additions, 0 deletionssource/RobotAPI/libraries/aron/converter/common/Converter.h
- source/RobotAPI/libraries/aron/converter/common/VectorConverter.cpp 1 addition, 0 deletions...otAPI/libraries/aron/converter/common/VectorConverter.cpp
- source/RobotAPI/libraries/aron/converter/common/VectorConverter.h 69 additions, 0 deletions...obotAPI/libraries/aron/converter/common/VectorConverter.h
- source/RobotAPI/libraries/aron/converter/eigen/CMakeLists.txt 2 additions, 3 deletions...ce/RobotAPI/libraries/aron/converter/eigen/CMakeLists.txt
- source/RobotAPI/libraries/aron/converter/ivt/CMakeLists.txt 9 additions, 2 deletionssource/RobotAPI/libraries/aron/converter/ivt/CMakeLists.txt
- source/RobotAPI/libraries/aron/converter/opencv/CMakeLists.txt 9 additions, 2 deletions...e/RobotAPI/libraries/aron/converter/opencv/CMakeLists.txt
- source/RobotAPI/libraries/aron/converter/pcl/CMakeLists.txt 8 additions, 2 deletionssource/RobotAPI/libraries/aron/converter/pcl/CMakeLists.txt
- source/RobotAPI/libraries/aron/core/CMakeLists.txt 5 additions, 8 deletionssource/RobotAPI/libraries/aron/core/CMakeLists.txt
Loading
Please register or sign in to comment