diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:43 +0200 |
commit | f7a93757c709e8b2902bc4707752edb8649d009c (patch) | |
tree | 32c9b5bbae7af27e5439aec8e1aa96e9193fa7a5 /.qmake.conf | |
parent | 62d9b69e4d9ee9f180e4ac07fb72e00a002d3c02 (diff) | |
parent | 8a2c5887cc7af6b0bb2fef913bc2acca5002cbf0 (diff) | |
download | qtmultimedia-f7a93757c709e8b2902bc4707752edb8649d009c.tar.gz |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I33bc33f979003302b66a57f34a4d64fcb8986d7d
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions