summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-10 14:33:12 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-10 14:33:17 +0200
commitd90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f (patch)
tree3432628840d9ddb14dae7121d211d7e09bbad215 /src/3rdparty
parentf46abef02cf5c883deba753afeff0042fa36b6e4 (diff)
parentf1f876b353446ebb271d167482f5e0414f88e10f (diff)
downloadqtlocation-d90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions