Commit e79de124 authored by Sergio Ahumada's avatar Sergio Ahumada
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ib20f075f0ffa8cf0b64dad2dcd6ede825d36a551
parents 9b8fb655 82d7e1d3
Branches
Tags
No related merge requests found
Showing with 373 additions and 87 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