Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

bfc5769a

Commit bfc5769a authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

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

# Conflicts:
#	source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp

parents 81a809f1 8bfaaa14

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/components/RemoteGuiProvider/RemoteGuiProvider.cpp 9 additions, 3 deletions

...arXGui/components/RemoteGuiProvider/RemoteGuiProvider.cpp
source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp 18 additions, 13 deletions

...gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp
source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.h 4 additions, 2 deletions

...i/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.h
source/ArmarXGui/interface/RemoteGuiInterface.ice 5 additions, 2 deletions

source/ArmarXGui/interface/RemoteGuiInterface.ice
source/ArmarXGui/libraries/RemoteGui/WidgetProxy.h 5 additions, 1 deletion

source/ArmarXGui/libraries/RemoteGui/WidgetProxy.h
source/ArmarXGui/libraries/StructuralJson/JsonData.cpp 2 additions, 2 deletions

source/ArmarXGui/libraries/StructuralJson/JsonData.cpp
source/ArmarXGui/libraries/StructuralJson/JsonData.h 1 addition, 1 deletion

source/ArmarXGui/libraries/StructuralJson/JsonData.h
source/ArmarXGui/libraries/StructuralJson/JsonWriter.cpp 17 additions, 3 deletions

source/ArmarXGui/libraries/StructuralJson/JsonWriter.cpp
source/ArmarXGui/libraries/StructuralJson/JsonWriter.h 4 additions, 2 deletions

source/ArmarXGui/libraries/StructuralJson/JsonWriter.h

with 65 additions and 29 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