Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Wed, 14 May 2014 06:38:38 +0000 (08:38 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Wed, 14 May 2014 06:39:04 +0000 (08:39 +0200)
Conflicts:
.qmake.conf

Change-Id: Ib20f075f0ffa8cf0b64dad2dcd6ede825d36a551

1  2 
src/androiddeployqt/main.cpp
src/qtdiag/qtdiag.cpp

Simple merge
Simple merge