diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
| commit | be13464a488ccc2837b0c178ff16086be341e570 (patch) | |
| tree | c0923835f7522452ca12f66a7a3785b2c6b70d5a /src/imports | |
| parent | 93cd42ef606178261e12eeffc88cd4b7d029dbc3 (diff) | |
| parent | 444a2d5b19e601e74e78384c823d7d048e797c4c (diff) | |
| download | qtlocation-be13464a488ccc2837b0c178ff16086be341e570.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions