diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:03:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:03:35 +0100 |
| commit | 3d157f9773a2db1a3096a86e5170ace975646ca3 (patch) | |
| tree | dbd80681ab81d0364cb32e0796ddf43a366cee35 /src/3rdparty/libtiff/libtiff/tiffvers.h | |
| parent | 8ca5b34c1aacc4b7a8f20bf9aadd04f1eeafd3f6 (diff) | |
| parent | ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Iaaf98e10d41867b2c6ceda89cb5c9c315301190b
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tiffvers.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffvers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tiffvers.h b/src/3rdparty/libtiff/libtiff/tiffvers.h index 403d61b..aa3f613 100644 --- a/src/3rdparty/libtiff/libtiff/tiffvers.h +++ b/src/3rdparty/libtiff/libtiff/tiffvers.h @@ -1,4 +1,4 @@ -#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.0.10\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." +#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.1.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc." /* * This define can be used in code that requires * compilation-related definitions specific to a @@ -6,4 +6,4 @@ * version checking should be done based on the * string returned by TIFFGetVersion. */ -#define TIFFLIB_VERSION 20181110 +#define TIFFLIB_VERSION 20191103 |