diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:48:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 12:14:41 +0100 |
| commit | f0c46685091fade417f118bfdc8ccdcbb4e9b9ce (patch) | |
| tree | c15e1ec9bc3d0a9efde163e8359eeac64be626b2 /src/imports | |
| parent | 16423f84f970d7dac644a4b041e3ebe2ac0f6e22 (diff) | |
| parent | de5be121d84b062f1b72c91dddc877e5e88babc0 (diff) | |
| download | qtlocation-f0c46685091fade417f118bfdc8ccdcbb4e9b9ce.tar.gz | |
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Conflicts:
src/location/maps/maps.pri
Change-Id: I066bcc5480de93fc627a30aa13f0392d64e36b84
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions