Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sahumada@blackberry.com>
Thu, 22 May 2014 08:16:25 +0000 (10:16 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Thu, 22 May 2014 08:16:25 +0000 (10:16 +0200)
commit52969e957df3db332e6d95105a2600ab8f5f0ec6
tree5bcaade2883125c9c18904062d8da7dfff150546
parentcb424d26eac75a14316726b4687758fd10c85563
parent25596443e11aa9fdfe124fe390a44474dfb715c7
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp

Change-Id: I2bf1657c6dd3b73e654e7db8bdadadfb293e2180
src/imports/positioning/positioning.cpp
tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
tests/auto/qgeomapscene/tst_qgeomapscene.cpp