Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

233773b5

Commit 233773b5 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'ScenarioManagerStatusFix' into 'master'

Design update for merge request ArmarX/ArmarXCore!94

See merge request !41

parents 000638b9 2b61b2de

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 2
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp 27 additions, 24 deletions

...rmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp 7 additions, 4 deletions

...marXGui/gui-plugins/ScenarioManager/gui/scenariomodel.cpp

with 34 additions and 28 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