Commit 68a98516 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I6e1ef2cfdde5dc34d6971bfd6ed89c6102daf679
parents 91f124cf da033ca3
No related merge requests found
Showing with 32 additions and 24 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