diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:30:37 +0200 |
| commit | aad6b43ae451197c1640a46ad0db363999e4cc55 (patch) | |
| tree | 659c1ffc908fdc44d26b82ddfe2250882c968b3b | |
| parent | 06290ec441d9a031797fa91e499a1070f25715e7 (diff) | |
| parent | 63cd689a400ee57f7e898e81290366c266537982 (diff) | |
| download | qtlocation-aad6b43ae451197c1640a46ad0db363999e4cc55.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I9c1e999c2971aaeb1434cdf2e8e06edc7acb76c1
0 files changed, 0 insertions, 0 deletions