summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-17 22:54:56 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-17 22:54:56 +0200
commit5d0481603414a4584dbfe89aaba48a6135b9e2d8 (patch)
treea8868da5003265d55a3ff5f2cc380ca41756f582 /src/imports
parent9cf6d7e77fc7029c35af56d943e4267051845c0a (diff)
parent7cfd70fa2f8fd24053d31122ac0a27eb56915895 (diff)
downloadqtlocation-5d0481603414a4584dbfe89aaba48a6135b9e2d8.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions