Skip to content
Commit 51a80ad0 authored by Ralf Habacker's avatar Ralf Habacker
Browse files

Merge remote-tracking branch 'origin/master' into frameworks 

Conflicts:
	CMakeLists.txt
	doc/CMakeLists.txt
	umbrello/CMakeLists.txt
	umbrello/uml.cpp
	unittests/CMakeLists.txt
parents 2fc0c088 95db74ff
Hide whitespace changes
Inline Side-by-side
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