Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

6e5d32ab

Commit 6e5d32ab authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

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

parents 03f114a5 5e235471

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ScenarioManager/controller/DetailedApplicationController.cpp 3 additions, 3 deletions

...narioManager/controller/DetailedApplicationController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp 1 addition, 2 deletions

...ins/ScenarioManager/controller/ScenarioListController.cpp

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