Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

bfbd2644

Commit bfbd2644 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 10a31e01 f70ec567

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h 3 additions, 8 deletions

...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp 4 additions, 1 deletion

...ins/ScenarioManager/controller/ScenarioListController.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/data_structure/ApplicationInstance.cpp 2 additions, 2 deletions

...ns/ScenarioManager/data_structure/ApplicationInstance.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/data_structure/ApplicationInstance.h 2 additions, 1 deletion

...gins/ScenarioManager/data_structure/ApplicationInstance.h
source/ArmarXGui/gui-plugins/ScenarioManager/parser/iceparser.cpp 12 additions, 3 deletions

...rmarXGui/gui-plugins/ScenarioManager/parser/iceparser.cpp
source/ArmarXGui/gui-plugins/ScenarioManager/parser/iceparser.h 1 addition, 1 deletion

.../ArmarXGui/gui-plugins/ScenarioManager/parser/iceparser.h

with 24 additions and 16 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