user avatar
Merge branch 'stable' into dev
Sergio Ahumada authored
Conflicts:
	.qmake.conf

Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
ab19bcff
Name Last commit Last update