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/libraries/robot_name_service/CMakeLists.txt 0 additions, 0 deletionssource/RobotAPI/libraries/robot_name_service/CMakeLists.txt
- source/RobotAPI/libraries/robot_name_service/client/CMakeLists.txt 27 additions, 0 deletions...botAPI/libraries/robot_name_service/client/CMakeLists.txt
- source/RobotAPI/libraries/robot_name_service/client/Plugin.cpp 145 additions, 0 deletions...e/RobotAPI/libraries/robot_name_service/client/Plugin.cpp
- source/RobotAPI/libraries/robot_name_service/client/Plugin.h 81 additions, 0 deletionssource/RobotAPI/libraries/robot_name_service/client/Plugin.h
- source/RobotAPI/libraries/robot_name_service/client/plugins.cpp 6 additions, 0 deletions.../RobotAPI/libraries/robot_name_service/client/plugins.cpp
- source/RobotAPI/libraries/robot_name_service/client/plugins.h 8 additions, 0 deletions...ce/RobotAPI/libraries/robot_name_service/client/plugins.h
- source/RobotAPI/libraries/robot_name_service/core/CMakeLists.txt 24 additions, 0 deletions...RobotAPI/libraries/robot_name_service/core/CMakeLists.txt
- source/RobotAPI/libraries/robot_name_service/core/Robot.cpp 79 additions, 0 deletionssource/RobotAPI/libraries/robot_name_service/core/Robot.cpp
- source/RobotAPI/libraries/robot_name_service/core/Robot.h 59 additions, 0 deletionssource/RobotAPI/libraries/robot_name_service/core/Robot.h
- source/RobotAPI/libraries/robot_name_service/server/CMakeLists.txt 25 additions, 0 deletions...botAPI/libraries/robot_name_service/server/CMakeLists.txt
- source/RobotAPI/libraries/robot_name_service/server/plugins.cpp 6 additions, 0 deletions.../RobotAPI/libraries/robot_name_service/server/plugins.cpp
- source/RobotAPI/libraries/robot_name_service/server/plugins.h 6 additions, 0 deletions...ce/RobotAPI/libraries/robot_name_service/server/plugins.h
- source/RobotAPI/libraries/skills/core/Skill.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/skills/core/Skill.cpp
- source/RobotAPI/libraries/skills/core/SkillProxy.cpp 13 additions, 3 deletionssource/RobotAPI/libraries/skills/core/SkillProxy.cpp
- source/RobotAPI/libraries/skills/core/error/Exception.h 16 additions, 10 deletionssource/RobotAPI/libraries/skills/core/error/Exception.h
- source/RobotAPI/libraries/skills/provider/mixins/GraspReadingSkillMixin.h 5 additions, 3 deletions...libraries/skills/provider/mixins/GraspReadingSkillMixin.h
- source/RobotAPI/libraries/skills/provider/mixins/MemoryReadingSkillMixin.h 4 additions, 3 deletions...ibraries/skills/provider/mixins/MemoryReadingSkillMixin.h
- source/RobotAPI/libraries/skills/provider/mixins/ObjectReadingSkillMixin.h 9 additions, 5 deletions...ibraries/skills/provider/mixins/ObjectReadingSkillMixin.h
- source/RobotAPI/libraries/skills/provider/mixins/ObjectWritingSkillMixin.h 4 additions, 3 deletions...ibraries/skills/provider/mixins/ObjectWritingSkillMixin.h
- source/RobotAPI/libraries/skills/provider/mixins/RobotReadingSkillMixin.h 9 additions, 8 deletions...libraries/skills/provider/mixins/RobotReadingSkillMixin.h
Loading
Please register or sign in to comment