changeset 2762:ba2b96e342fc

Merge up to jdk8u45-b14
author enevill
date Thu, 16 Apr 2015 11:37:19 +0100
parents 737d62ee16a1 (current diff) 847af465a542 (diff)
children 628accf3a0d4
files .hgtags
diffstat 2 files changed, 24 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 03 14:42:20 2015 +0000
+++ b/.hgtags	Thu Apr 16 11:37:19 2015 +0100
@@ -343,6 +343,8 @@
 53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17
 a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7 jdk8u25-b18
 c4de614efd7affc001715aa5a7040620924ac44a jdk8u25-b31
+a2a922ccc00f29af625cbecde8e77643c60f147c jdk8u25-b32
+b72a49d88cc3f5394b69b861455552476341558d jdk8u25-b33
 c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00
 6b5e2c190f3023162a33b798e57a0d78e027c843 jdk8u31-b01
 8b4ea00b438d7f99ecd6a8345cb018d8a0379620 jdk8u31-b02
@@ -357,6 +359,8 @@
 e72be544fa9e247fba3c6bb61e291d80e127a461 jdk8u31-b11
 c956b12b30ee21a4fc5df1871fa3b01e84310ebe jdk8u31-b12
 7a34ec7bb1c831e82ac88da578a028572b676260 jdk8u31-b13
+b813a76f10911ac8db2c775e52b29f36ab0005f4 jdk8u31-b31
+8dc0c7e42d90c9f323582b742a7f228bad57b124 jdk8u31-b32
 d231957fe3103e790465fcf058fb8cb33bbc4c4e jdk8u40-b00
 bf89a471779d13a9407f7d1c86f7716258bc4aa6 jdk8u40-b01
 df9cb52f5dd70d8da138276f4ee2427012d2d385 jdk8u40-b02
@@ -383,3 +387,19 @@
 fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
 c5d4ffa220f3824c2ea5d39dc99d41a9df9e5ae5 jdk8u40-b24
 991141080b2078e67179ff307a5051e59431762c jdk8u40-b25
+2904142783dd0a9e12195a84c7dcdb3d8278b1b1 jdk8u40-b26
+83eca922346e27ec42645e9630c04fbaec5eaf0f jdk8u40-b27
+dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
+244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01
+401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02
+79d31ae9990e28b99dd64beda6dd247993138431 jdk8u45-b03
+47292f3c0da7dd197a28765004b588bc3141d189 jdk8u45-b04
+77d7dd7f35d63f9fe60ed0b7ef32e4e9a8b46c0b jdk8u45-b05
+22cc48973eae62c63e68c4c4e3f22ff2d89012a8 jdk8u45-b06
+460238ab73ce27112b3d0d7236366960f9898259 jdk8u45-b07
+6dd7fd9f027bf037517feae2a571848aa8fbc20f jdk8u45-b08
+db16aa5c73c99d0050246660ebebb6166002ff57 jdk8u45-b09
+572895f19937b7aadc8c27c5e83887bf40f5bcff jdk8u45-b10
+0547ef2be3b303923b30ce78e1ab832725483f4e jdk8u45-b11
+4f89bbda7b4532b9f6eeee8c41b7a3b38570ae93 jdk8u45-b12
+5ce022bca792453a7efedaed419a9d763d7a9fc3 jdk8u45-b13
--- a/THIRD_PARTY_README	Tue Mar 03 14:42:20 2015 +0000
+++ b/THIRD_PARTY_README	Thu Apr 16 11:37:19 2015 +0100
@@ -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 ---