aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorenevill <none@none>2015-04-16 11:35:37 +0100
committerenevill <none@none>2015-04-16 11:35:37 +0100
commitfb123aa6fb3801a0090f25d433cb93982d2f3ab6 (patch)
treeafdb2801417e7595b2fe139ef0c02a57217eff5a
parentd528b4884dda31f6a14fb1c812a7ab9e0207f21e (diff)
parentbb3d0aa7a5a3a8d54523ffa5c0f23341e6ae4c98 (diff)
Merge up to jdk8u45-b14HEADmaster
-rw-r--r--.hgtags20
-rw-r--r--THIRD_PARTY_README8
2 files changed, 24 insertions, 4 deletions
diff --git a/.hgtags b/.hgtags
index 69ce326..2783d7c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -345,6 +345,8 @@ f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
1a0b4ec68abc4e9248ca6041fff04612674a9b9f jdk8u25-b31
+cc8541804eb47d86b30c5b005c6fa6ecb6a53538 jdk8u25-b32
+ec5219b942d277059d89063fb3702bc5e076dfd0 jdk8u25-b33
6db0898d3f90ad9eae2f017299314b88766446e3 jdk8u31-b00
85792859f3bdd6a2c1bdfcf2828bb2730e06ac3c jdk8u31-b01
4898a7460ae620ac5356cb224e1fdf3c29312533 jdk8u31-b02
@@ -359,6 +361,8 @@ ea4b31ec437d74c62b844bd8b35f0bc3a27915b4 jdk8u31-b09
ec85d5d0e3c05b0b6d61f4fc3f41313448ed9b05 jdk8u31-b11
ca98e3e9727ffdcde2c9980668d0c7f344261938 jdk8u31-b12
fde671d8b2537b6be61f67e583164b5b8b33ac5b jdk8u31-b13
+a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31
+99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32
0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
91ba3391548717179e62e08a2d2bd6b8cc774a6d jdk8u40-b02
@@ -385,3 +389,19 @@ b6d03a810a61116268fea08517a9632bd66a7363 jdk8u40-b22
5dd2ad6c7911a1e21f15a28f13ffad662378a3be jdk8u40-b23
5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24
e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25
+7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26
+12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
+ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
+635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
+801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02
+7d11a7eee8c0512fa15d3ed2dcded5391b0c091d jdk8u45-b03
+3d79ef8a102ffe22b083d07649a1d9e22cf784b6 jdk8u45-b04
+45f8fc9d30021026a5101c8946af98f7c079b537 jdk8u45-b05
+9a5843fdd2cf8120515d98572440c5c35118254d jdk8u45-b06
+74ef61db0fe02e3eaa5156a7bab9f00f2a2143de jdk8u45-b07
+0c10bc33556383b8e665998c62145a8398e7f7ef jdk8u45-b08
+733d16eb42cb105749588c9b93cc408155ed99ad jdk8u45-b09
+9a343fd13810a8f09d3dd4a9e2e20791bb866166 jdk8u45-b10
+6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11
+54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12
+6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index c34ce6b..cd88baf 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1250,7 +1250,7 @@ included with JDK 8 and OpenJDK 8 source distributions.
-------------------------------------------------------------------------------
-%% 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 sentence.
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 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-July 7, 2011
+December 22, 2014
--- end of LICENSE ---