Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

b7064137

Commit b7064137 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into GuiPluginCaching

parents 9dcd2fc0 a8766fc7

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp 13 additions, 0 deletions

...plugins/ScenarioManager/controller/SettingsController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp 9 additions, 5 deletions

...i-plugins/ScenarioManager/gui/detailedapplicationview.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp 38 additions, 18 deletions

...rmarXGui/gui-plugins/ScenarioManager/gui/scenarioitem.cpp

with 60 additions and 23 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