diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-10-01 17:38:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-01 17:38:53 +0200 |
commit | bb519a4001ae9ed1e780017ea8551c37c0098529 (patch) | |
tree | bb15cb6c430d49f9c85c96eed7582b4ff4271118 /.qmake.conf | |
parent | 0452ea44b05093e6d9357dfbe52f3d5cc1e5ebf4 (diff) | |
parent | 77703754d73b9309683c83ca4460e599eb8f28e2 (diff) | |
download | qtquickcontrols-bb519a4001ae9ed1e780017ea8551c37c0098529.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions