summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libtiff/libtiff/tiffvers.h
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-11-07 09:28:59 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-11-07 09:28:59 +0200
commit598e1db3a082d2bb473571c6ae3359e0c687c63b (patch)
treee88d80d6cf6aaeaf6afb8f37d4bc4404405e2bd2 /src/3rdparty/libtiff/libtiff/tiffvers.h
parent00187760aaa137b68e74186ee0cbfb3e1da72281 (diff)
parent6d4cf4b392c53e3edb8573d89b5ca4b6257bb99f (diff)
Merge 5.12 into 5.12.6
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tiffvers.h')
-rw-r--r--src/3rdparty/libtiff/libtiff/tiffvers.h4
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