diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:38:57 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:39:48 +0100 |
commit | f878323a82fa69fcaeb37b42e10ba28759157f47 (patch) | |
tree | 696de2c441060e8c6ed53278ff8b76f9f66e63f6 | |
parent | a0dfb529325e0def520dd11853d76a85d78a393b (diff) | |
parent | 25d7e0440f091b39c2865187eb0630045fa20e46 (diff) | |
download | qtimageformats-f878323a82fa69fcaeb37b42e10ba28759157f47.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I5e5351525277400a74f2762a91a9c70f8493b6a2
0 files changed, 0 insertions, 0 deletions