Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

4a5e1780

Commit 4a5e1780 authored 7 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into SCEWithViewer

parents 812d5e9d f37be8af

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc 1 addition, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc
source/ArmarXGui/libraries/ArmarXGuiBase/icons/tools.svg 1 addition, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/icons/tools.svg
source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp 26 additions, 23 deletions

...marXGui/libraries/WidgetDescription/WidgetDescription.cpp
source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.h 16 additions, 7 deletions

...ArmarXGui/libraries/WidgetDescription/WidgetDescription.h

with 44 additions and 30 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