Commit 6d3df9df authored by Sergio Ahumada's avatar Sergio Ahumada
Browse files

Merge branch 'stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I8472ccedaa829436aebf4424b64a3b7dd0adc173
parents 85c2acf0 d6b4d9ad
Branches
Tags
No related merge requests found
Showing with 25 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