Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:15:24 +0000 (14:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 11 Apr 2014 12:15:24 +0000 (14:15 +0200)
commit56e80eb797b55458614599a82c2264c46e6e5eb0
tree5740b8ed298559c45f045d5daad8481e4c3eb39b
parentba8da105e12f272bd95e2c10e7035edaaaecfa2a
parent400c7fa8e767c65aab4b8a1d5161b5259080cec9
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib061722a7ebc4b26bf132c67a005910f2d39400f
src/imports/location/qdeclarativegeomap.cpp