Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:05:20 +0000 (16:05 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:05:20 +0000 (16:05 +0100)
commit871addbdcb8e346efb86268443b99ec7d03fedf5
tree535da475f6c01223cb468d4c7f3497303626cbcf
parent9520f82e00f26d7d217f7d2777ba2f3cd958d012
parent8cc5a741d016d49952d4eb15dac57cc34c1e2344
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ie63ca45ad8e2c57ad27c7b693f268ce5c4cc18f4