Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

0ae41311

Commit 0ae41311 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' into ScenarioManager

parents a323072e e406cd71

No related branches found

No related tags found

1 merge request!7Integrated ScenarioManager plugin

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp 5 additions, 6 deletions

...-plugins/StatechartEditorPlugin/StateEditorController.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateTreeController.cpp 8 additions, 3 deletions

...ui-plugins/StatechartEditorPlugin/StateTreeController.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/model/State.cpp 0 additions, 1 deletion

...arXGui/gui-plugins/StatechartViewerPlugin/model/State.cpp

with 13 additions and 10 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