summaryrefslogtreecommitdiffstats
path: root/third_party/libpng/LICENSE
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 18:22:04 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 18:22:04 +0000
commit71b9d6403ceaaef6b2b258fbb32f1a77b7c875e6 (patch)
tree30c9d23615c9d559a845b282a18b994d417e8f40 /third_party/libpng/LICENSE
parentfe5aac24dff85b8a035dbda9660d7b470fb08df0 (diff)
downloadchromium_src-71b9d6403ceaaef6b2b258fbb32f1a77b7c875e6.zip
chromium_src-71b9d6403ceaaef6b2b258fbb32f1a77b7c875e6.tar.gz
chromium_src-71b9d6403ceaaef6b2b258fbb32f1a77b7c875e6.tar.bz2
libpng: update to 1.2.43
I unpacked libpng 1.2.43 and did: cd third_party/libpng for x in $(ls -1) ; do cp /tmp/libpng-1.2.43/$x .; done The diffs appear to all be safe. The Chromium specific config is in pngusr.h and isn't touched by this change. 1.2.43 fixes http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0205 c7013d773eb45b8ed6a864e419e544106a0dd95d /tmp/libpng-1.2.43.tar.xz BUG=38512 TEST=none http://codereview.chromium.org/1118002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/LICENSE')
-rw-r--r--third_party/libpng/LICENSE6
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/libpng/LICENSE b/third_party/libpng/LICENSE
index cdb787d..8521813 100644
--- a/third_party/libpng/LICENSE
+++ b/third_party/libpng/LICENSE
@@ -8,7 +8,9 @@ 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.37, June 4, 2009, are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.43, February 25, 2010, 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
-June 4, 2009
+February 25, 2010