Skip to content
Snippets Groups Projects
Commit 8fc54821 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of https://i61wiki.itec.uka.de/git/armarxgui 

Conflicts:
	source/Gui/ArmarXGui/GuiWindow.cpp
	source/Gui/gui_plugins/SensorActorWidgetsPlugin/CMakeLists.txt
	source/Gui/gui_plugins/StateChartPlugin/StateChartGraphGuiPlugin.cpp
parents a5d2f2e9 a68d87c2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 172 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment