diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-04-08 12:30:36 +0200 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-04-09 12:14:28 +0000 |
| commit | 68c137cc725ceadec68c455e0e3e365ecb00f2c1 (patch) | |
| tree | 242485964753e2e7890015694a916c71755cdfb3 /src/3rdparty/libpng/LICENSE | |
| parent | f0cee4568ec3bd58cbc33108a6e606c3294e0fb3 (diff) | |
Update bundled libpng to version 1.6.17
Merged in the upstream version, which obsoleted many of the local
patches. The remaining diff to clean 1.6.17 is archived in the
qtpatches.diff file.
Change-Id: I5065435dc5a922d3f4a46eb37a23a4877dde2ee6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libpng/LICENSE')
| -rw-r--r-- | src/3rdparty/libpng/LICENSE | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE index b72d1258e3..eb4a9a9da4 100644 --- a/src/3rdparty/libpng/LICENSE +++ b/src/3rdparty/libpng/LICENSE @@ -10,8 +10,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are +Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 29, 2012 +March 26, 2015 |