Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:42 +0000 (16:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 6 Jan 2014 15:30:42 +0000 (16:30 +0100)
commit224194151ccde2b255ba24e14855b2fa497f1952
tree219fe37ef6a92c35ab68ef7b70a7ff79a98c96f7
parentcadf9042a844e4c65e4a7b40086dc6fcc3eb5eaa
parent0151f7f2901b281e358a5ece436e2464b4b8d79c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Iebfffe157538b0a0573e9bfbed7eeac6f53390b1
.qmake.conf