Skip to content
Snippets Groups Projects

Merge of all branches of Fabian PK (related to skills)

Merged Merge of all branches of Fabian PK (related to skills)
test/merge-branch-skills-to-master into master
Merged Fabian Tërnava requested to merge test/merge-branch-skills-to-master into master
Viewing commit 72093353
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
29
  • 72093353 
    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