Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

0311149b

Commit 0311149b authored 6 years ago by Fabian Paus

Downloads
- Plain Diff

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

parents 1de4206e 7cad29db

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/gui/applicationdatabaseitem.cpp 2 additions, 3 deletions

...i-plugins/ScenarioManager/gui/applicationdatabaseitem.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp 1 addition, 1 deletion

...marXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp 2 additions, 2 deletions

...rXGui/gui-plugins/StatechartViewerPlugin/StateWatcher.cpp

with 5 additions and 6 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