Commit 9c79a3de authored by Sergio Ahumada's avatar Sergio Ahumada
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ia3c3478a804b369b00aabb5739f409bd11dbb982
parents 712ecdac 2b71f5f2
No related merge requests found
Showing with 6 additions and 5 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