Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

1faea09b

There was a problem fetching the pipeline summary.

Commit 1faea09b authored 7 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 3df3ab0a 741a79ef

No related branches found

No related tags found

Loading

Pipeline #

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/ObserverItemModel.cpp 1 addition, 1 deletion

...ui-plugins/ObserverPropertiesPlugin/ObserverItemModel.cpp
source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/VariantWidget.cpp 0 additions, 6 deletions

...lugins/ObserverPropertiesPlugin/widgets/VariantWidget.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StateEditorController.cpp 1 addition, 1 deletion

...-plugins/StatechartEditorPlugin/StateEditorController.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt 3 additions, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/CMakeLists.txt
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/EnhancedGraphicsView.cpp 178 additions, 0 deletions

.../libraries/ArmarXGuiBase/widgets/EnhancedGraphicsView.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/EnhancedGraphicsView.h 92 additions, 0 deletions

...ui/libraries/ArmarXGuiBase/widgets/EnhancedGraphicsView.h
source/ArmarXGui/libraries/VariantWidget/VariantWidget.cpp 1 addition, 1 deletion

source/ArmarXGui/libraries/VariantWidget/VariantWidget.cpp

with 276 additions and 9 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