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

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

Conflicts:
	source/ArmarXGui/gui-plugins/StatechartEditorPlugin/test/XmlReaderTest.cpp
parents 64da7945 934a4d5c
No related branches found
No related tags found
No related merge requests found
Showing
with 706 additions and 130 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 to comment