Commit 48708a6a authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: I792cdcb53c271d64f58cd25e6541665daa6efcac
parents 33cc78b8 78c2367e
Branches
Tags
No related merge requests found
Showing with 0 additions and 0 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