Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

4d0a9acf

Verified Commit 4d0a9acf authored 8 months ago by Christian Dreher

Downloads
- Plain Diff

Merge branch 'master' into fix/emergency_stop_button

parents 82222054 b48f55fc

No related branches found

No related tags found

1 merge request!99Fix rogue emergency stop button

Pipeline #20572 failed 8 months ago

Stage: build-and-test

Changes 4
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

...narioManager/controller/DetailedApplicationController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp 206 additions, 110 deletions

...ins/ScenarioManager/controller/ScenarioListController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.cpp 258 additions, 114 deletions

...i-plugins/ScenarioManager/gui/detailedapplicationview.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/gui/detailedapplicationview.h 16 additions, 7 deletions

...gui-plugins/ScenarioManager/gui/detailedapplicationview.h

with 542 additions and 265 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