Mercurial > hg > release > icedtea8-forest-3.0 > jaxws

changeset 882:949f2f7f879f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 17 Mar 2015 12:06:08 -0700
parents bba10054d51c (current diff) bad02ac45d59 (diff)
children c56d9ab25cd2
files .hgtags
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 26 10:51:27 2015 -0800
+++ b/.hgtags	Tue Mar 17 12:06:08 2015 -0700
@@ -378,6 +378,8 @@
 b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
 5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
 b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
+1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26
+a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27
 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
 cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
 855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
@@ -388,6 +390,10 @@
 145ea6d2899f5cc6bd4e1108903e4d22ad063eca jdk8u45-b07
 f3d678fe58e7c026fb62be8b72c46ce1015aadf6 jdk8u45-b08
 8f2e5110151810dc5b56a3ce05d955e400bee937 jdk8u45-b09
+5cf887e3e1368d1910181eaab2794b25058fe8b6 jdk8u45-b10
+855fd9dfcbee177b508413dbab6e46b57dd367c4 jdk8u45-b11
+3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
+15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
 7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
 5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
--- a/THIRD_PARTY_README	Thu Feb 26 10:51:27 2015 -0800
+++ b/THIRD_PARTY_README	Tue Mar 17 12:06:08 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 ---