Commit d949ef10 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I4c0a9ad9d5e5a28f9faf572279344d86af69fb4c
parents 686b98e5 a441d816
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