-
- Downloads
Merge branch 'master' of https://i61wiki.itec.uka.de/git/armarxgui
Conflicts: source/Gui/ArmarXGui/ArmarXGuiApp.cpp
No related branches found
No related tags found
Showing
- etc/cmake/ArmarXGui.cmake 4 additions, 5 deletionsetc/cmake/ArmarXGui.cmake
- source/Gui/ArmarXGui/ArmarXGuiApp.h 37 additions, 38 deletionssource/Gui/ArmarXGui/ArmarXGuiApp.h
- source/Gui/ArmarXGui/CMakeLists.txt 9 additions, 7 deletionssource/Gui/ArmarXGui/CMakeLists.txt
- source/Gui/ArmarXGui/GuiWindow.cpp 6 additions, 6 deletionssource/Gui/ArmarXGui/GuiWindow.cpp
- source/Gui/ArmarXGui/ViewerWidget.cpp 0 additions, 5 deletionssource/Gui/ArmarXGui/ViewerWidget.cpp
- source/Gui/ArmarXGui/ViewerWidget.h 26 additions, 26 deletionssource/Gui/ArmarXGui/ViewerWidget.h
- source/Gui/ArmarXGuiLib/ArmarXGuiInterface.h 5 additions, 1 deletionsource/Gui/ArmarXGuiLib/ArmarXGuiInterface.h
- source/Gui/gui_plugins/ConditionViewerPlugin/CMakeLists.txt 1 addition, 1 deletionsource/Gui/gui_plugins/ConditionViewerPlugin/CMakeLists.txt
- source/Gui/gui_plugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.h 6 additions, 3 deletions..._plugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.h
- source/Gui/gui_plugins/ConditionViewerPlugin/ConditionViewerWidgetController.h 16 additions, 16 deletions...s/ConditionViewerPlugin/ConditionViewerWidgetController.h
- source/Gui/gui_plugins/ConditionViewerPlugin/TermNode.h 27 additions, 24 deletionssource/Gui/gui_plugins/ConditionViewerPlugin/TermNode.h
- source/Gui/gui_plugins/ConditionViewerPlugin/TreeNode.h 103 additions, 92 deletionssource/Gui/gui_plugins/ConditionViewerPlugin/TreeNode.h
- source/Gui/gui_plugins/ConditionViewerPlugin/widgets/ConditionItemModel.h 13 additions, 13 deletions...lugins/ConditionViewerPlugin/widgets/ConditionItemModel.h
- source/Gui/gui_plugins/ConditionViewerPlugin/widgets/ConditionViewerWidget.h 15 additions, 15 deletions...ins/ConditionViewerPlugin/widgets/ConditionViewerWidget.h
- source/Gui/gui_plugins/ConditionViewerPlugin/widgets/TermNodeGraphicsItem.h 13 additions, 13 deletions...gins/ConditionViewerPlugin/widgets/TermNodeGraphicsItem.h
- source/Gui/gui_plugins/ConditionViewerPlugin/widgets/TermTreeGraphicsScene.h 10 additions, 10 deletions...ins/ConditionViewerPlugin/widgets/TermTreeGraphicsScene.h
- source/Gui/gui_plugins/KinematicUnitPlugin/CMakeLists.txt 2 additions, 2 deletionssource/Gui/gui_plugins/KinematicUnitPlugin/CMakeLists.txt
- source/Gui/gui_plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h 1 addition, 1 deletion...i_plugins/KinematicUnitPlugin/KinematicUnitConfigDialog.h
- source/Gui/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h 4 additions, 4 deletions.../gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
- source/Gui/gui_plugins/LoggingPlugin/CMakeLists.txt 2 additions, 9 deletionssource/Gui/gui_plugins/LoggingPlugin/CMakeLists.txt
Loading
Please register or sign in to comment