Merge remote-tracking branch 'origin/aron/dev' into fabianpk
Showing
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 11 additions, 8 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 2 additions, 2 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
- source/RobotAPI/libraries/armem/client/util/MemoryListener.h 5 additions, 1 deletionsource/RobotAPI/libraries/armem/client/util/MemoryListener.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 32 additions, 23 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 10 additions, 1 deletion...otAPI/libraries/armem_objects/server/instance/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 1 addition, 1 deletion...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 80 additions, 16 deletions...libraries/armem_robot_state/client/common/RobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 10 additions, 4 deletions...I/libraries/armem_robot_state/client/common/RobotReader.h
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 3 additions, 3 deletions...es/armem_robot_state/client/common/VirtualRobotReader.cpp
- source/RobotAPI/libraries/aron/converter/common/VectorConverter.h 74 additions, 11 deletions...obotAPI/libraries/aron/converter/common/VectorConverter.h
- source/RobotAPI/libraries/aron/core/Path.cpp 2 additions, 0 deletionssource/RobotAPI/libraries/aron/core/Path.cpp
- source/RobotAPI/libraries/aron/core/Path.h 2 additions, 2 deletionssource/RobotAPI/libraries/aron/core/Path.h
- source/RobotAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h 21 additions, 3 deletions...otAPI/libraries/aron/core/data/visitor/RecursiveVisitor.h
Loading
Please register or sign in to comment