Skip to content
GitLab
Commit c3601a8d authored by Michael Brasser's avatar Michael Brasser
Browse files

Merge branch 'master' into animation-refactor 

Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504
parents 35794301 149f6afe
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 28 deletions
Supports Markdown
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