Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

59713498

Commit 59713498 authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/Ice3.7' into Ice3.7-ScenarioManagerIceExecuting

parents d7ebeeb9 2fd0721d

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 3 additions, 0 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/model/StatechartGroup.cpp 1 addition, 1 deletion

...-plugins/StatechartEditorPlugin/model/StatechartGroup.cpp

with 4 additions and 1 deletion

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