Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:31 +0000 (16:03 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 29 Nov 2013 15:03:31 +0000 (16:03 +0100)
commit0a6191c01b6a855cb871286ac48c45d01b34310a
treeb89f2182025809a2b425df1a5256388b151eeddb
parente376d9bb3a94d28c30c67baa7bc385baaf65a035
parentbe13521707249d4d89085e6e850944056ab923f7
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I3c90652f618afcf6a5f26232558843b8e26d8164
.qmake.conf