Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

b7721898

Commit b7721898 authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

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

parents 2d35364a 580bf01b

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/MessageDisplayPlugin/MessageDisplayPluginWidgetController.cpp 5 additions, 3 deletions

...ageDisplayPlugin/MessageDisplayPluginWidgetController.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp 7 additions, 5 deletions

...i-plugins/StatechartEditorPlugin/model/StateTreeModel.cpp

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