diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-04-21 14:52:01 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-04-21 14:52:30 +0200 |
commit | fa0560ef9f23ab8e3bf3a0ea82d835468a3d2449 (patch) | |
tree | fcf131ebea2e229a402c00797afffd236139027c /.qmake.conf | |
parent | 2f325118f15bb4382e0031532137eaa3bf90d758 (diff) | |
parent | e41c3a9b345536ccee0840ac6f049173aa6a0785 (diff) | |
download | qtlocation-fa0560ef9f23ab8e3bf3a0ea82d835468a3d2449.tar.gz |
Merge remote-tracking branch 'gerrit/5.7' into dev
Change-Id: I7d73ac8b9e3fc010678068a4bcd814815f92591e
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions