Merge of all branches of Fabian PK (related to skills)
Compare changes
Files
3- Fabian Tërnava authored
Merge remote-tracking branch 'origin/feature/skills-manager-edit-arguments' into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/TODO # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
+ 12
− 12
@@ -64,7 +64,6 @@ namespace armarx
@@ -117,7 +116,7 @@ namespace armarx
@@ -169,20 +168,21 @@ namespace armarx