Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / png / LICENSE

diff --git a/src/png/LICENSE b/src/png/LICENSE
index 84e459435b832eef339f31fda928c0010a542714..756ebd04570a734d907564f818b0206d2ceaf652 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.
 
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 

-libpng versions 1.0.7, July 1, 2000, through 1.2.4, July 8, 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.4.4, September 23, 2010, are
+Copyright (c) 2004, 2006-2010 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
 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
 certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson

-randeg@alum.rpi.edu
-July 8, 2002
+glennrp at users.sourceforge.net
+September 23, 2010