user avatar
Merge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn authored
Conflicts:
	.qmake.conf

Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
f217661e
Name Last commit Last update