Skip to content
GitLab
Commit d74fd9b0 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

Merge remote-tracking branch 'origin/5.11' into 5.12 

Conflicts:
	src/3rdparty
	src/core/core_common.pri

Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
parents 7de23e9f 89afebb8
Hide whitespace changes
Inline Side-by-side
Showing
with 154 additions and 8 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