Merge remote-tracking branch 'origin/master' into feature/skillMemoryGUI
# Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
No related branches found
No related tags found
Showing
- scenarios/SkillProviderTest/config/ArVizStorage.cfg 9 additions, 0 deletionsscenarios/SkillProviderTest/config/ArVizStorage.cfg
- scenarios/SkillProviderTest/config/DebugObserver.cfg 9 additions, 0 deletionsscenarios/SkillProviderTest/config/DebugObserver.cfg
- scenarios/SkillProviderTest/config/MemoryNameSystem.cfg 9 additions, 0 deletionsscenarios/SkillProviderTest/config/MemoryNameSystem.cfg
- scenarios/SkillProviderTest/config/RemoteGuiProviderApp.cfg 9 additions, 0 deletionsscenarios/SkillProviderTest/config/RemoteGuiProviderApp.cfg
- scenarios/SkillProviderTest/config/SkillProviderExample.cfg 9 additions, 0 deletionsscenarios/SkillProviderTest/config/SkillProviderExample.cfg
- source/RobotAPI/components/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/CMakeLists.txt
- source/RobotAPI/components/RobotDefinition/CMakeLists.txt 26 additions, 0 deletionssource/RobotAPI/components/RobotDefinition/CMakeLists.txt
- source/RobotAPI/components/RobotDefinition/RobotDefinition.cpp 55 additions, 0 deletions...e/RobotAPI/components/RobotDefinition/RobotDefinition.cpp
- source/RobotAPI/components/RobotDefinition/RobotDefinition.h 88 additions, 0 deletionssource/RobotAPI/components/RobotDefinition/RobotDefinition.h
- source/RobotAPI/components/RobotDefinition/test/CMakeLists.txt 5 additions, 0 deletions...e/RobotAPI/components/RobotDefinition/test/CMakeLists.txt
- source/RobotAPI/components/RobotDefinition/test/RobotNameServiceTest.cpp 14 additions, 8 deletions.../components/RobotDefinition/test/RobotNameServiceTest.cpp
- source/RobotAPI/components/RobotNameService/CMakeLists.txt 23 additions, 7 deletionssource/RobotAPI/components/RobotNameService/CMakeLists.txt
- source/RobotAPI/components/RobotNameService/RobotNameService.cpp 52 additions, 11 deletions...RobotAPI/components/RobotNameService/RobotNameService.cpp
- source/RobotAPI/components/RobotNameService/RobotNameService.h 24 additions, 20 deletions...e/RobotAPI/components/RobotNameService/RobotNameService.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 6 additions, 4 deletions...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 132 additions, 67 deletions...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 14 additions, 38 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 3 additions, 0 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.cpp 72 additions, 0 deletions...rPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.h 27 additions, 0 deletions...gerPlugin/aronTreeWidget/widgets/SkillDescriptionWidget.h
Loading
Please register or sign in to comment