Commit 20c3575f authored by Lars Knoll's avatar Lars Knoll
Browse files

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

Conflicts:
	src/declarative/declarative.pro

Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
parents 71478352 3108a369
Branches
Tags
No related merge requests found
Showing with 482 additions and 58 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