Use WS_EX_CONTROLPARENT for wxStaticBox in wxMSW.

[wxWidgets.git] / src / png / LICENSE

diff --git a/src/png/LICENSE b/src/png/LICENSE
index 65c9d4678e15f7508ff25c265d54fe40de825bf6..e23bca425c19d824b7cf5d10b278544f3208a609 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, August 15, 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.5.7, December 15, 2011, are
+Copyright (c) 2004, 2006-2011 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
-August 15, 2004
+glennrp at users.sourceforge.net
+December 15, 2011