diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-15 20:17:51 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-15 20:17:51 +0100 |
commit | 54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba03 (patch) | |
tree | dcd54d5b95afc849510f70147bec39416360792f /src/3rdparty/libtiff/VERSION | |
parent | c34ab1c43a3cbbaad127eb8bc6fd9b5c90a1169f (diff) | |
parent | 3c607b324ffbf84ce9803d80a04c7d663e847496 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
.qmake.conf
Change-Id: I827727fde51a71cbef5d61fb6cc2cd45d5e3bd7c
Diffstat (limited to 'src/3rdparty/libtiff/VERSION')
-rw-r--r-- | src/3rdparty/libtiff/VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/VERSION b/src/3rdparty/libtiff/VERSION index a2cec7a..7919852 100644 --- a/src/3rdparty/libtiff/VERSION +++ b/src/3rdparty/libtiff/VERSION @@ -1 +1 @@ -4.0.8 +4.0.9 |