diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:14 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:14 +0100 |
| commit | d369cf01b5617961c2d0c9db7a7be6c25b42954a (patch) | |
| tree | bcd31b4ca0edc5c554483f88cc0e9d5dc16e934a /src/location/maps | |
| parent | 9485871222fb3c8f5f2d058ae8c5c0ca13b0ce2c (diff) | |
| parent | b17c07dc0b947c979372fbaf558ce9acc07d1837 (diff) | |
| download | qtlocation-d369cf01b5617961c2d0c9db7a7be6c25b42954a.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I8d0881209c8b0a0dce4ed949ef89ee2679448420
Diffstat (limited to 'src/location/maps')
0 files changed, 0 insertions, 0 deletions