summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 16:46:14 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-12 16:46:14 +0100
commit4c0599e2537a439f59ee91e1561c1c3ecf0b34e0 (patch)
tree93256959b9b9a1b57cd4908a6ebb421ef6afd3b2 /.qmake.conf
parent77d1b56b136595b898432ec4de982e3eaa9533f3 (diff)
parentc0a9f3da16960fa6ab4d240aa7fbe72b74a841ba (diff)
downloadqtlocation-4c0599e2537a439f59ee91e1561c1c3ecf0b34e0.tar.gz
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions