summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/pngconf.h
diff options
context:
space:
mode:
authorEirik Aavitsland <eirik.aavitsland@theqtcompany.com>2016-02-10 13:57:10 +0100
committeraavit <eirik.aavitsland@theqtcompany.com>2016-03-16 14:32:49 +0000
commit714cb4020e12e078e8ba8c2c5493d138d515f46d (patch)
tree3fc151b4662f4f4a9c5ea4bcf4444d87cd817444 /src/3rdparty/libpng/pngconf.h
parent10a4151e83da4662eb51a8c67760f2e38d84759e (diff)
Update bundled libpng to version 1.6.20
Merged in the upstream version. The remaining diff to clean 1.6.20 is archived in the qtpatches.diff file. Change-Id: I56f557bfe04ac1aa0e2c090826bbb144ae93cbb7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libpng/pngconf.h')
-rw-r--r--src/3rdparty/libpng/pngconf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h
index f1b795b478..92f250000c 100644
--- a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.19, July 23, 2015
+ * libpng version 1.6.20, December 3, 2015
*
* Copyright (c) 1998-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)