Merge branch 'stable' into dev
authorAlex Blasche <alexander.blasche@digia.com>
Mon, 5 May 2014 08:27:16 +0000 (10:27 +0200)
committerAlex Blasche <alexander.blasche@digia.com>
Mon, 5 May 2014 08:27:16 +0000 (10:27 +0200)
commit8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe
tree05435d06e51d4d4a3ebbbdaab6d550c634155beb
parent56e80eb797b55458614599a82c2264c46e6e5eb0
parentd603bd03795b412fd7a20f4bd804e236560a90c6
Merge branch 'stable' into dev

Conflicts:
.qmake.conf
src/src.pro

Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
src/positioning/qdoublevector2d_p.h
src/positioning/qdoublevector3d_p.h
src/src.pro