diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 16:14:42 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-21 18:40:23 +0000 |
| commit | f9e746959b9c7acbc080c410fe5cb5dff127c5dd (patch) | |
| tree | b602fcc7baaa934f3f8fbd338f4dae6c906c1ede /src/3rdparty/libpng/LICENSE | |
| parent | 686e37b1b7c40d0e864ab47165be3a0d4faa9a68 (diff) | |
| parent | 6cb8121a44ee0f94f2c9fcb075d1d3c802d8c5c7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/3rdparty/libpng/LICENSE')
| -rw-r--r-- | src/3rdparty/libpng/LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE index 11f6ffe5db..82dbe117f6 100644 --- a/src/3rdparty/libpng/LICENSE +++ b/src/3rdparty/libpng/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.19, November 12, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.20, December 3, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 12, 2015 +December 3, 2015 |