summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-10 18:29:23 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-01-10 18:29:24 +0100
commitd4b1cfc2e9345f25b0669bb225d05b04bb3fc72c (patch)
treeda5ea65fc4016b265a2071d5793cb6cf4e658519 /src/imports
parent4d3134b673faf5eb3c84e37bff25c8d678172ee3 (diff)
parent9aa2031c487583b1b92681d0575f51fe3377cc8b (diff)
downloadqtlocation-d4b1cfc2e9345f25b0669bb225d05b04bb3fc72c.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7f649542227dcdeb062b0b8368a301334fa9969b
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions