Merge libpng 1.6.2 into the trunk.

[wxWidgets.git] / src / png / LICENSE

diff --git a/src/png/LICENSE b/src/png/LICENSE
index 3e5a36abb9675eb1a7af60dd93d78604f3a27e0f..acb4e1781b3f05168c2784edf7ca8e62ca1ba46a 100644 (file)
--- a/src/png/LICENSE
+++ b/src/png/LICENSE
@@ -8,8 +8,10 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 

-libpng version 1.2.6, September 12, 2004, is
-Copyright (c) 2004 Glenn Randers-Pehrson, and is
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.6.2, April 25, 2013, are
+Copyright (c) 2004, 2006-2012 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
 
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
 


@@ -105,5 +107,5 @@ Libpng is OSI Certified Open Source Software.  OSI Certified Open Source is a
 certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson

-glennrp@users.sourceforge.net
-September 12, 2004
+glennrp at users.sourceforge.net
+April 25, 2013