Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

cf2347c8

Commit cf2347c8 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/ArmarXGui

parents e28eea6f 50406f0e

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.cpp 1 addition, 0 deletions

...i/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h 14 additions, 0 deletions

...ugins/StatechartEditorPlugin/StatechartEditorController.h
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp 49 additions, 43 deletions

...rXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h 1 addition, 1 deletion

...marXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.h
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StatechartViewerController.cpp 9 additions, 40 deletions

...ins/StatechartViewerPlugin/StatechartViewerController.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StatechartViewerController.h 1 addition, 2 deletions

...ugins/StatechartViewerPlugin/StatechartViewerController.h
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/view/StatechartViewer.ui 35 additions, 27 deletions

...i-plugins/StatechartViewerPlugin/view/StatechartViewer.ui
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/ArmarXManagerModel.cpp 1 addition, 1 deletion

...i-plugins/SystemStateMonitorPlugin/ArmarXManagerModel.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp 9 additions, 1 deletion

...ins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp

with 120 additions and 115 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment