Merge branch 'feature/cleanup-and-opencv4-include' into 'master'
cleanup + opencv4 include See merge request !499
Showing
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 0 additions, 2 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/armem/server/ltm/processors/converter/data/image/png/PngConverter.cpp 1 addition, 0 deletions.../ltm/processors/converter/data/image/png/PngConverter.cpp
- source/RobotAPI/libraries/armem_objects/server/familiar_object_instance/Segment.cpp 0 additions, 1 deletion...armem_objects/server/familiar_object_instance/Segment.cpp
- source/RobotAPI/libraries/skills/core/Skill.cpp 2 additions, 0 deletionssource/RobotAPI/libraries/skills/core/Skill.cpp
- source/RobotAPI/libraries/skills/core/Skill.h 0 additions, 3 deletionssource/RobotAPI/libraries/skills/core/Skill.h
- source/RobotAPI/libraries/skills/core/SkillDescription.h 0 additions, 1 deletionsource/RobotAPI/libraries/skills/core/SkillDescription.h
- source/RobotAPI/libraries/skills/core/SkillID.h 0 additions, 2 deletionssource/RobotAPI/libraries/skills/core/SkillID.h
- source/RobotAPI/libraries/skills/core/SkillProxy.cpp 2 additions, 0 deletionssource/RobotAPI/libraries/skills/core/SkillProxy.cpp
- source/RobotAPI/libraries/skills/core/SkillStatusUpdate.cpp 2 additions, 0 deletionssource/RobotAPI/libraries/skills/core/SkillStatusUpdate.cpp
- source/RobotAPI/libraries/skills/core/SkillStatusUpdate.h 0 additions, 5 deletionssource/RobotAPI/libraries/skills/core/SkillStatusUpdate.h
- source/RobotAPI/libraries/skills/core/error/Exception.h 0 additions, 2 deletionssource/RobotAPI/libraries/skills/core/error/Exception.h
- source/RobotAPI/libraries/skills/provider/PeriodicSkill.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/skills/provider/PeriodicSkill.cpp
- source/RobotAPI/libraries/skills/provider/PeriodicSpecializedSkill.h 1 addition, 0 deletions...tAPI/libraries/skills/provider/PeriodicSpecializedSkill.h
- source/RobotAPI/libraries/skills/provider/SimplePeriodicSkill.cpp 2 additions, 0 deletions...obotAPI/libraries/skills/provider/SimplePeriodicSkill.cpp
- source/RobotAPI/libraries/skills/provider/SimplePeriodicSpecializedSkill.h 1 addition, 0 deletions...ibraries/skills/provider/SimplePeriodicSpecializedSkill.h
- source/RobotAPI/libraries/skills/provider/SpecializedSkill.h 35 additions, 41 deletionssource/RobotAPI/libraries/skills/provider/SpecializedSkill.h
- source/RobotAPI/libraries/skills/provider/detail/SkillImplementationWrapper.cpp 1 addition, 0 deletions...ies/skills/provider/detail/SkillImplementationWrapper.cpp
Loading
Please register or sign in to comment