# HG changeset patch # User asaha # Date 1426027641 25200 # Node ID 074c51bbdb55cabb55ad66e700fc04d022262fb5 # Parent a4dcd3f6b9c25a3b6e8f3ce55bba5b3ec56eac59# Parent 40af410251eb0c6e8232ae25cffca6294ccd5480 Merge diff -r a4dcd3f6b9c2 -r 074c51bbdb55 THIRD_PARTY_README --- a/THIRD_PARTY_README Mon Mar 09 15:25:34 2015 -0700 +++ b/THIRD_PARTY_README Tue Mar 10 15:47:21 2015 -0700 @@ -1250,7 +1250,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which may be +%% This notice is provided with respect to libpng 1.6.16, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1266,8 +1266,8 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are +Copyright (c) 2004, 2006-2014 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 @@ -1364,7 +1364,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE ---