diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-04 13:31:03 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-04 13:31:03 +0200 |
| commit | 73f25d1a411ede3f78e8468999b4d362c51180d3 (patch) | |
| tree | 654fa0c3840fc7d7ff92f853e1f2928eba56ffcb /src/3rdparty/libtiff/ChangeLog | |
| parent | 51ab877ae95d79d47fa99c39b1be7c8a570b2339 (diff) | |
| parent | 144a3535db9f95e60972d3c3b6eaceb65a604577 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I55c144a1d0579aa19691c44c4f8ef8bf702189cb
Diffstat (limited to 'src/3rdparty/libtiff/ChangeLog')
0 files changed, 0 insertions, 0 deletions