Skip to content
Snippets Groups Projects
Commit 72093353 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Merge branch 'feature/skills-manager-edit-arguments' of...

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
parents 00ee4e44 c28d544e
No related branches found
No related tags found
1 merge request!321Merge of all branches of Fabian PK (related to skills)
Showing
with 940 additions and 448 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment