summaryrefslogtreecommitdiff
path: root/qtlocation.pro
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2016-06-03 07:50:35 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2016-06-03 07:50:35 +0200
commit970174b9e95709ccacc5123dbc81dc3c11f27705 (patch)
tree17534e581dae4da5ba6edc5a78a4cbf3bae2faee /qtlocation.pro
parentfa0560ef9f23ab8e3bf3a0ea82d835468a3d2449 (diff)
parentf46abef02cf5c883deba753afeff0042fa36b6e4 (diff)
downloadqtlocation-970174b9e95709ccacc5123dbc81dc3c11f27705.tar.gz
Merge remote-tracking branch 'gerrit/5.7' into dev
Change-Id: Ica8afd5e07240d2279a0f098cc03f8443663a209
Diffstat (limited to 'qtlocation.pro')
0 files changed, 0 insertions, 0 deletions