Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:05 +0000 (16:08 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:08:05 +0000 (16:08 +0100)
commitcadf9042a844e4c65e4a7b40086dc6fcc3eb5eaa
tree1b978eee4be098f6022767915e167610b60a4a33
parentdc9952e2b360df9b271f54f207919a03268b12a9
parent85fd99e853d664c74876486f95669bd4cd9f2ab2
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I96adbf312c94e0f70ccc8d2b676155e1f79a56cb