Commit 871addbd authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: Ie63ca45ad8e2c57ad27c7b693f268ce5c4cc18f4
parents 9520f82e 8cc5a741
No related merge requests found
Showing with 24 additions and 12 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