Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

339236d4

Commit 339236d4 authored 8 years ago by Cedric Seehausen

Downloads
- Plain Diff

Merge branch 'master' into ScenarioManagerTreeViewFixes

parents eabec751 c25c827b

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 13 additions, 3 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 1 addition, 3 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
source/ArmarXGui/gui-plugins/StatechartViewerPlugin/layout/LayoutController.cpp 1 addition, 1 deletion

...lugins/StatechartViewerPlugin/layout/LayoutController.cpp
source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp 20 additions, 18 deletions

source/ArmarXGui/libraries/ArmarXGuiBase/PluginCache.cpp

with 35 additions and 25 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