Commit 72093353 authored 2 years ago by Fabian Tërnava

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)

This commit is part of merge request !321. Comments created here will be created in the context of that merge request.

Hide whitespace changes

Inline Side-by-side

Showing with 940 additions and 448 deletions

Please register or to comment