
Fabian Tërnava
authored
Merge branch 'feature/skills-manager-edit-arguments' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetCreator.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetSetter.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h
Name | Last commit | Last update |
---|---|---|
.gitlab | ||
build | ||
data | ||
docs | ||
etc | ||
scenarios | ||
source | ||
.gitignore | ||
CMakeLists.txt | ||
README.md | ||
README.txt | ||
gpl-2.0.txt |