Skip to content
Commit d780d15e authored by Laurent Montel's avatar Laurent Montel
Browse files

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

Conflicts:
	autotests/mainshelltest.cpp
	part.cpp
	part.h
	shell/shell.cpp
parents c50c3d53 1eafe4fe
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