diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:01:38 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-06 03:01:38 +0200 |
commit | 8a6594e50337d6f43ffce8215ad8cfc3abdda64d (patch) | |
tree | 6031dc3e6504a3506c1bbdca6b18883d8612271d /.qmake.conf | |
parent | 00e6ddfccec25bfb6dd3f39e8897cf9baf453b99 (diff) | |
parent | 8b702b66aa09d6e59da1c99af353eac36cff01e4 (diff) | |
download | qtlocation-8a6594e50337d6f43ffce8215ad8cfc3abdda64d.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ibe88e68076fc3a722432c07fe4c0358f0bb032ea
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions