Commit 717ba7e6 authored by Sergio Ahumada's avatar Sergio Ahumada
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
parents 0c35647c eb16b197
No related merge requests found
Showing with 8 additions and 2 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