Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

b21c2efc

Commit b21c2efc authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 84d5b036 440b0971

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 4 additions, 4 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogTableModel.cpp 1 addition, 1 deletion

...i-plugins/LoggingPlugin/ArmarXLogViewer/LogTableModel.cpp
source/ArmarXGui/gui-plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp 1 addition, 1 deletion

...plugins/StatechartEventSenderPlugin/EventSenderConfig.cpp
source/ArmarXGui/gui-plugins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp 1 addition, 2 deletions

...ins/SystemStateMonitorPlugin/SystemStateMonitorWidget.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc 1 addition, 0 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/armarxicons.qrc
source/ArmarXGui/libraries/ArmarXGuiBase/icons/speech-bubble.ico 0 additions, 0 deletions

...ArmarXGui/libraries/ArmarXGuiBase/icons/speech-bubble.ico
source/ArmarXGui/libraries/ArmarXGuiBase/widgets/IceProxyFinder.h 3 additions, 3 deletions

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

with 11 additions and 11 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