summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-16 08:56:41 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-16 08:56:41 +0200
commit7cfd70fa2f8fd24053d31122ac0a27eb56915895 (patch)
tree0c00f796a0eda186e9e08624ced2dfbc6f893739 /src/plugins
parent35514ce506a1cfe299952f75072814373d0f8c97 (diff)
parent7d01112c36a98912706e9d33ce2e36126de0ccec (diff)
downloadqtlocation-7cfd70fa2f8fd24053d31122ac0a27eb56915895.tar.gz
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: Idb1702345cd3a51edae3846883cab8ea1eaebd68
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions