Merge remote-tracking branch 'origin/master' into feature/skillMemoryGUI
# Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
No related branches found
No related tags found
Showing
- source/RobotAPI/interface/CMakeLists.txt 3 additions, 1 deletionsource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/robot_name_service/RobotNameServiceInterface.ice 90 additions, 0 deletions...nterface/robot_name_service/RobotNameServiceInterface.ice
- source/RobotAPI/libraries/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/CMakeLists.txt
- source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp 21 additions, 13 deletions...RobotAPI/libraries/armem/client/util/SimpleReaderBase.cpp
- source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h 3 additions, 10 deletions...e/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h
- source/RobotAPI/libraries/armem_grasping/client/KnownGraspCandidateReader.h 0 additions, 1 deletion...braries/armem_grasping/client/KnownGraspCandidateReader.h
- source/RobotAPI/libraries/armem_objects/client/instance/ObjectWriter.h 0 additions, 1 deletion...PI/libraries/armem_objects/client/instance/ObjectWriter.h
- source/RobotAPI/libraries/armem_robot_state/server/CMakeLists.txt 4 additions, 0 deletions...obotAPI/libraries/armem_robot_state/server/CMakeLists.txt
- source/RobotAPI/libraries/armem_robot_state/server/common/Visu.cpp 75 additions, 8 deletions...botAPI/libraries/armem_robot_state/server/common/Visu.cpp
- source/RobotAPI/libraries/armem_robot_state/server/common/Visu.h 15 additions, 1 deletion...RobotAPI/libraries/armem_robot_state/server/common/Visu.h
- source/RobotAPI/libraries/armem_robot_state/server/common/combine.cpp 7 additions, 3 deletions...API/libraries/armem_robot_state/server/common/combine.cpp
- source/RobotAPI/libraries/armem_robot_state/server/common/combine.h 1 addition, 1 deletion...otAPI/libraries/armem_robot_state/server/common/combine.h
- source/RobotAPI/libraries/armem_robot_state/server/forward_declarations.h 6 additions, 1 deletion...libraries/armem_robot_state/server/forward_declarations.h
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.cpp 71 additions, 20 deletions...aries/armem_robot_state/server/proprioception/Segment.cpp
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/Segment.h 4 additions, 4 deletions...braries/armem_robot_state/server/proprioception/Segment.h
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/SensorValues.cpp 2 additions, 0 deletions.../armem_robot_state/server/proprioception/SensorValues.cpp
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/SensorValues.h 50 additions, 0 deletions...es/armem_robot_state/server/proprioception/SensorValues.h
- source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Reader.cpp 173 additions, 52 deletions...I/libraries/aron/codegeneration/typereader/xml/Reader.cpp
- source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp 2 additions, 3 deletions...otAPI/libraries/aron/core/data/variant/container/Dict.cpp
- source/RobotAPI/libraries/aron_component_config/RemoteGuiVisitors.cpp 81 additions, 39 deletions...API/libraries/aron_component_config/RemoteGuiVisitors.cpp
Loading
Please register or sign in to comment