diff THIRD_PARTY_README @ 21870:12dcf5ba8b34

Merge with jdk8u45-b14
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 09 Jun 2015 11:54:04 +0200
parents 7848fc12602b 005fa3e7c752
children dd9cc155639c
line wrap: on
line diff
--- a/THIRD_PARTY_README	Tue Jun 09 07:51:46 2015 +0200
+++ b/THIRD_PARTY_README	Tue Jun 09 11:54:04 2015 +0200
@@ -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 ---