Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into...
Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
Showing
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 2 additions, 1 deletion...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp 0 additions, 4 deletions...lugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
- source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/CMakeLists.txt
- source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp 2 additions, 1 deletion...ce/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp 31 additions, 37 deletions...em_robot_state/server/proprioception/RobotStateWriter.cpp
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h 6 additions, 2 deletions...rmem_robot_state/server/proprioception/RobotStateWriter.h
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp 2 additions, 3 deletions...mem_robot_state/server/proprioception/RobotUnitReader.cpp
- source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h 5 additions, 2 deletions...armem_robot_state/server/proprioception/RobotUnitReader.h
- source/RobotAPI/libraries/aron/core/data/variant/container/Dict.cpp 24 additions, 3 deletions...otAPI/libraries/aron/core/data/variant/container/Dict.cpp
- source/RobotAPI/libraries/aron/core/data/variant/container/List.cpp 6 additions, 1 deletion...otAPI/libraries/aron/core/data/variant/container/List.cpp
- source/RobotAPI/libraries/obstacle_avoidance/CMakeLists.txt 28 additions, 0 deletionssource/RobotAPI/libraries/obstacle_avoidance/CMakeLists.txt
- source/RobotAPI/libraries/obstacle_avoidance/CollisionModelHelper.cpp 154 additions, 0 deletions...API/libraries/obstacle_avoidance/CollisionModelHelper.cpp
- source/RobotAPI/libraries/obstacle_avoidance/CollisionModelHelper.h 57 additions, 0 deletions...otAPI/libraries/obstacle_avoidance/CollisionModelHelper.h
- source/RobotAPI/libraries/skills/provider/detail/SkillImplementationWrapper.cpp 6 additions, 6 deletions...ies/skills/provider/detail/SkillImplementationWrapper.cpp
Loading
Please register or sign in to comment