summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-01 21:57:56 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-01 21:57:57 +0200
commit3f813d1c8c24e5da67d3f096eb3f5c73e760e641 (patch)
treec9fa2a075660ccd3ef3015b2892a61b847cd9288 /src/plugins/geoservices/osm
parent42372ce4c4114f7e38fc5ac681e9199869b4619f (diff)
parent26b2f917861e63091cf97a5acba04d7b813c2fed (diff)
downloadqtlocation-3f813d1c8c24e5da67d3f096eb3f5c73e760e641.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I0880e4aa40fbf9fe0bb639f7fd77a52044e91a6e
Diffstat (limited to 'src/plugins/geoservices/osm')
0 files changed, 0 insertions, 0 deletions