Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

aa2a3820

Commit aa2a3820 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 03a3b38d f50d9bba

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/CMakeLists.txt 1 addition, 0 deletions

...rXGui/gui-plugins/ObserverPropertiesPlugin/CMakeLists.txt
source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp 61 additions, 14 deletions

...ugins/ObserverPropertiesPlugin/widgets/ObserverWidget.cpp
source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/properties/FilterPropertiesDialog.ui 76 additions, 0 deletions

...ertiesPlugin/widgets/properties/FilterPropertiesDialog.ui
source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp 26 additions, 13 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp

with 164 additions and 27 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