diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:33 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:33 +0200 |
commit | 5dddfc5121cac154023569fe69b417054ba53188 (patch) | |
tree | 47fffd0231e5b4d10fa41db18dc48b2e653f95dc /.qmake.conf | |
parent | 347daef6fbf084711fcec0df4421780f6c8a0bb0 (diff) | |
parent | d771c5dd31b46d76a8b9b9043263b754df81467d (diff) | |
download | qtlocation-5dddfc5121cac154023569fe69b417054ba53188.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I8768dd3f81a7f53020771f60332b1ed144b4ed07
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions