-
- Downloads
Merge remote-tracking branch 'origin/master' into Ice3.7-ScenarioManagerIceExecuting
# Conflicts: # source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h # source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/createpropertyview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/createscenarioview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/namelocationview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/openscenarioview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/packageadderview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariolistview.cpp # source/ArmarXGui/gui-plugins/ScenarioManager/gui/settingsview.cpp
No related branches found
No related tags found
Showing
- source/ArmarXGui/gui-plugins/ClockPlugin/ClockGuiPlugin.cpp 0 additions, 4 deletionssource/ArmarXGui/gui-plugins/ClockPlugin/ClockGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/ClockPlugin/ClockGuiPlugin.h 0 additions, 2 deletionssource/ArmarXGui/gui-plugins/ClockPlugin/ClockGuiPlugin.h
- source/ArmarXGui/gui-plugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.cpp 0 additions, 4 deletions...lugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.h 0 additions, 2 deletions...-plugins/ConditionViewerPlugin/ConditionViewerGuiPlugin.h
- source/ArmarXGui/gui-plugins/ConditionViewerPlugin/widgets/TermNodeGraphicsItem.h 0 additions, 3 deletions...gins/ConditionViewerPlugin/widgets/TermNodeGraphicsItem.h
- source/ArmarXGui/gui-plugins/IceProxy/IceProxyGuiPlugin.cpp 0 additions, 4 deletionssource/ArmarXGui/gui-plugins/IceProxy/IceProxyGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/IceProxy/IceProxyGuiPlugin.h 0 additions, 2 deletionssource/ArmarXGui/gui-plugins/IceProxy/IceProxyGuiPlugin.h
- source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp 0 additions, 5 deletionssource/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.cpp
- source/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.h 0 additions, 2 deletionssource/ArmarXGui/gui-plugins/LoggingPlugin/LoggingPlugin.h
- source/ArmarXGui/gui-plugins/MessageDisplayPlugin/MessageDisplayPluginGuiPlugin.cpp 0 additions, 4 deletions...ns/MessageDisplayPlugin/MessageDisplayPluginGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/MessageDisplayPlugin/MessageDisplayPluginGuiPlugin.h 0 additions, 2 deletions...gins/MessageDisplayPlugin/MessageDisplayPluginGuiPlugin.h
- source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/ObserverGuiPlugin.cpp 0 additions, 4 deletions...ui-plugins/ObserverPropertiesPlugin/ObserverGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/ObserverGuiPlugin.h 0 additions, 2 deletions.../gui-plugins/ObserverPropertiesPlugin/ObserverGuiPlugin.h
- source/ArmarXGui/gui-plugins/PlotterPlugin/PlotterPluginGuiPlugin.cpp 0 additions, 4 deletions...XGui/gui-plugins/PlotterPlugin/PlotterPluginGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/PlotterPlugin/PlotterPluginGuiPlugin.h 0 additions, 2 deletions...arXGui/gui-plugins/PlotterPlugin/PlotterPluginGuiPlugin.h
- source/ArmarXGui/gui-plugins/PlotterPlugin/StaticPlotterWidgetController.cpp 0 additions, 21 deletions...i-plugins/PlotterPlugin/StaticPlotterWidgetController.cpp
- source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiPlugin.cpp 0 additions, 4 deletions...ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiPlugin.h 0 additions, 2 deletions...e/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiPlugin.h
- source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerGuiPlugin.cpp 0 additions, 4 deletions.../gui-plugins/ScenarioManager/ScenarioManagerGuiPlugin.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerGuiPlugin.h 0 additions, 2 deletions...ui/gui-plugins/ScenarioManager/ScenarioManagerGuiPlugin.h
Loading
Please register or sign in to comment