diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:58 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:53:58 +0100 |
commit | 65db62e4398c5ddfba1ea7825987b3f4ab04369e (patch) | |
tree | 0c21a6ee63675f4dafe9c922fd2e81805182f201 /src/3rdparty/zlib_dependency.pri | |
parent | 52dd6b1e9a3fe249b153bdcebe08455ff716309d (diff) | |
parent | 018828170d807f6647a843e61c82733c3f601d14 (diff) | |
download | qtimageformats-65db62e4398c5ddfba1ea7825987b3f4ab04369e.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I6c1caae4b071cac4caf88bf85582a2a76a1ccd2b
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
0 files changed, 0 insertions, 0 deletions