Merge branch 'stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:30:37 +0000 (10:30 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Mon, 5 Aug 2013 08:30:37 +0000 (10:30 +0200)
commitbfda474003a1776359003661f141567cfa37d0d5
tree3519abb57c66f18a7d0cd25eeaf14453ea6f1f95
parent87105efc53b2d807f5d33c1fb5ee92d348f31309
parentcfd6618b3b9526bc82410411249692a32f29ee88
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: I722d07e0de5ac4578867e5fdd2a9ee7779776b72