aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorenevill <none@none>2015-04-16 11:36:08 +0100
committerenevill <none@none>2015-04-16 11:36:08 +0100
commitb23a9df9898d75f2e9ce46d5e3dd4b8de89d978c (patch)
tree16e576785ca0d849641f130b25e7ed1bf65658b1
parent2a8c0e4998a86c75f8c36920ee116f8a19396e2c (diff)
parentbdbd0faba452749056fe08127091fa507b1e98b9 (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 4648ded..b1eac47 100644
--- a/.hgtags
+++ b/.hgtags
@@ -343,6 +343,8 @@ f560274aec4f42283c10070921afae403a153de2 jdk8u25-b12
f46df0af2ca8c7d896de375c8edac8ce09318318 jdk8u25-b17
ee069d67c12df902cdb06ecf1747f8ff9d495a61 jdk8u25-b18
8d0faa0eac61c04c6a5bbff2e084c9da0bd5251c jdk8u25-b31
+6617e1de7aa536d2e3671e3c50c340262b2b053e jdk8u25-b32
+c123ac2adfdc6049034d5970bec89b51ce5d8889 jdk8u25-b33
69793b08060c9d216fa84d679c48b9e22d2400ac jdk8u31-b00
fd5f8e3713803ca2d7898407a53996f3aa41521e jdk8u31-b01
b6e2d1b1b24585bd02512e360d842d4713afa644 jdk8u31-b02
@@ -357,6 +359,8 @@ b47677f7c1d122a2d05e03dec70de86feaedcd4c jdk8u31-b08
7e2056eba0b62247407e065f3f88a89358fc26a6 jdk8u31-b11
285b0e589c50e46ca7ad3434221335901a547d66 jdk8u31-b12
f89b454638d89ee5f44422b7a5b8e5651260e68f jdk8u31-b13
+705d3a4298f44f0a14925bfee5017f5824b6c0ca jdk8u31-b31
+072d325a052a5894019b74118803bf5fb9e30692 jdk8u31-b32
7d1e0f0b63f1d66c77924d8b2a1accdf8f7480db jdk8u40-b00
c5d9822a3c18cd9e274dfe99e91c33e02bd8f8f4 jdk8u40-b01
6ce7f0f15f67c3852d03d4bb068f4781d9ad1f0e jdk8u40-b02
@@ -383,3 +387,19 @@ a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
62f7faef5ed956cd481cae6216b22fdb4b6e3e46 jdk8u40-b23
472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24
2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25
+cab2b99c6bb2e15165a58eaa36157788f82592f1 jdk8u40-b26
+bd0186cd2419129357b110fe3f13519f68b29774 jdk8u40-b27
+5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
+6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
+3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02
+d3678799ed35f162928f387308d72f5401b37e84 jdk8u45-b03
+9dd8c8e1b0facfcf21657c91fc99bcb5319d1196 jdk8u45-b04
+b82ecb056ae3fd6ee06e765995c564b17a761221 jdk8u45-b05
+f538a9334f09535ef8fe13072f6a4a52e3187e1c jdk8u45-b06
+4dec7b828f1ee3adbf3c2b6430400db8b1abb5ad jdk8u45-b07
+16cb989c8b6220330a54fe78ae27b2f50fc5e794 jdk8u45-b08
+ace36a054b7faadb702d6f23e569efb77f0a7513 jdk8u45-b09
+b9ef43c59b425961526b04e92d7fa66014ec25eb jdk8u45-b10
+08c2ce4b6d59bc6b29e61fd8562b9e3d39b257a5 jdk8u45-b11
+c9bf2543c0c045ef31f0296bc355381e1a4bd4ac jdk8u45-b12
+326f02235e7a9a6da78428410320dcc980827d40 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 ---