Commit 2f2dd013 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

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

Conflicts:
	.qmake.conf

Change-Id: I44d12139aef2988cf7ec6c22129f105b597b6d54
parents 9db263e5 2c5999a3
Branches
Tags
Showing with 17 additions and 65 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