Merge libpng 1.6.2 into the trunk.

[wxWidgets.git] / src / png / LICENSE

diff --git a/src/png/LICENSE b/src/png/LICENSE
index 1f3a2537e4b396a201292376668f51b06b39edb1..acb4e1781b3f05168c2784edf7ca8e62ca1ba46a 100644 (file)
--- a/src/png/LICENSE
+++ b/src/png/LICENSE
@@ -8,9 +8,18 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng versions 1.0.7, July 1, 2000, through 1.2.5rc3, September 18, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson
-and are distributed according to the same disclaimer and license as libpng-1.0.6
+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
+
+   Cosmin Truta
+
+libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors
 
    Simon-Pierre Cadieux
@@ -98,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
-randeg@alum.rpi.edu
-September 18, 2002
+glennrp at users.sourceforge.net
+April 25, 2013