diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 09:32:41 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 09:33:00 +0100 |
commit | a41bd80784a01050dfb6b888cd90505259471f4f (patch) | |
tree | 673e80fec7d46d4073c798b8769cad46920bb8a3 /.qmake.conf | |
parent | cf6bf74b900db1efd2f2c6d51313505fade267ee (diff) | |
parent | 9969179a06c30b56d3d057aba127686b64ccd659 (diff) | |
download | qtlocation-a41bd80784a01050dfb6b888cd90505259471f4f.tar.gz |
Merge remote-tracking branch 'gerrit/5.5' into 5.6
Change-Id: I0a137c8feba6c7da613b03a67d7cd4521524c58e
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions