Commit 3f99082f authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
parents 717ba7e6 00f77bdc
Branches
Tags
Showing with 19 additions and 1 deletion
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