Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

edfc3765

Commit edfc3765 authored 7 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 13c88b49 4e707179

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

etc/doxygen/pages/HowTos.dox 1 addition, 0 deletions

etc/doxygen/pages/HowTos.dox
source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 1 addition, 1 deletion

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp 4 additions, 2 deletions

...i-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/CMakeLists.txt 1 addition, 1 deletion

...rXGui/gui-plugins/SystemStateMonitorPlugin/CMakeLists.txt
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp 1 addition, 0 deletions

...ins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp

with 8 additions and 4 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