summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/LICENSE
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2009-10-15 12:48:31 (GMT)
committeraavit <qt-info@nokia.com>2009-10-22 09:56:09 (GMT)
commited1892665111f900e4d831a41b4ec79666931f0d (patch)
treeca66edcdd61cbe36aa80f450953bf02a8e267df7 /src/3rdparty/libpng/LICENSE
parentd4a136dc3f1176665c19eec24fa43f40e5180a89 (diff)
downloadQt-ed1892665111f900e4d831a41b4ec79666931f0d.zip
Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.gz
Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.bz2
Upgrade libpng to version 1.2.40
This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
Diffstat (limited to 'src/3rdparty/libpng/LICENSE')
-rw-r--r--src/3rdparty/libpng/LICENSE8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/libpng/LICENSE b/src/3rdparty/libpng/LICENSE
index 072d9ef..93dd04a 100644
--- a/src/3rdparty/libpng/LICENSE
+++ b/src/3rdparty/libpng/LICENSE
@@ -8,8 +8,10 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.29, May 8, 2008, are
-Copyright (c) 2004, 2006-2008 Glenn Randers-Pehrson, and are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.40, September 10, 2009, are
+Copyright (c) 2004, 2006-2009 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
@@ -106,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-May 8, 2008
+September 10, 2009