Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 16:10:55 +0000 (17:10 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 16:10:56 +0000 (17:10 +0100)
commit8bc2ee48483ea67277fd141b4c007f52d88215d2
tree8b86707ac57fd5d3646c9c98b2d80e078dd96ae0
parent3f0cf919373e308d7c95fba1b4174c1f0f6eac32
parentafb65f63a131c4038b0984c1d51b8ffdb4aab129
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I918b255b204a5246fa9cdc9ed3f8c7d71ab01e35
.qmake.conf