summaryrefslogtreecommitdiffstats
path: root/qtlocation
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-12-12 20:39:25 +0100
committerLiang Qi <liang.qi@qt.io>2018-12-12 20:39:25 +0100
commit43b493d223459248210665befc4505c98c837284 (patch)
tree5998679827f3f79fcd0724a5fdcc3493342b2681 /qtlocation
parenta51b2dbf25e59caa5a3065dde9a816ea78300e9c (diff)
parentb093af02077a96f3f77eaf1cbbe3f6c26ecbb2c7 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'qtlocation')
0 files changed, 0 insertions, 0 deletions