diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-05-05 10:27:16 +0200 |
| commit | 8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe (patch) | |
| tree | 05435d06e51d4d4a3ebbbdaab6d550c634155beb /src/imports/location/qdeclarativegeomapitemview.cpp | |
| parent | 56e80eb797b55458614599a82c2264c46e6e5eb0 (diff) | |
| parent | d603bd03795b412fd7a20f4bd804e236560a90c6 (diff) | |
| download | qtlocation-8922ae1ef4f0cb01c15632dfe19ed514e0d49dbe.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
src/src.pro
Change-Id: Ibc0a58c565aec37fb09b96e27309f50892340cac
Diffstat (limited to 'src/imports/location/qdeclarativegeomapitemview.cpp')
0 files changed, 0 insertions, 0 deletions