Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

00e2eff1

Commit 00e2eff1 authored 6 years ago by Raphael Grimm

Downloads
- Plain Diff

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

parents 6e5d32ab 90e346c4

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

etc/cmake/ArmarXPackageVersion.cmake 2 additions, 2 deletions

etc/cmake/ArmarXPackageVersion.cmake
source/ArmarXGui/gui-plugins/ObserverPropertiesPlugin/widgets/properties/DataFieldPropertiesWidget.cpp 6 additions, 3 deletions

...esPlugin/widgets/properties/DataFieldPropertiesWidget.cpp
source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp 3 additions, 2 deletions

...ins/StatechartEditorPlugin/StatechartEditorController.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/IceGridViewer/IceGridViewer.cpp 1 addition, 1 deletion

.../SystemStateMonitorPlugin/IceGridViewer/IceGridViewer.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.cpp 37 additions, 8 deletions

...arXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h 5 additions, 0 deletions

...rmarXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h

with 54 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