aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorenevill <none@none>2015-04-16 11:37:27 +0100
committerenevill <none@none>2015-04-16 11:37:27 +0100
commited13960059274a681f6e7134a5deb27c4623a6bc (patch)
tree4935574a4431b073dbe2913ba7af7bdb3f938186
parent2727c24ceb6291a718a42d7b24e603633372275f (diff)
parent1fe82ee648e03abeb2b0226825dad4388398ef59 (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 7d631c48..9c7a1e9a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -330,6 +330,8 @@ f76715cd4e902602bdbb4ba9a3774c10afeee012 jdk8u25-b12
4b9cc65dd24d398c4f921c0beccfb8caeaaaf584 jdk8u25-b17
cdbf34dbef404b47805c8c85b11c65c2afaa6674 jdk8u25-b18
4f9e65387c21831d0ea5726641a302c2ce73a4cc jdk8u25-b31
+be20e9a00818df15af12544c21839c3a3d5768d9 jdk8u25-b32
+a8526abf70a8c98aee5fed64eb727210745a6e5a jdk8u25-b33
9b692a6e5f22228f822973d35610d37cb9dd9693 jdk8u31-b00
6bf53bb6c969678488b1c073d56dd55df1a0ea17 jdk8u31-b01
809bf97d7e70dcb3873fcbc10f12f62580b1c11d jdk8u31-b02
@@ -344,6 +346,8 @@ c68ba913a0eeea6eb94d9568e9985505ec3408a3 jdk8u31-b10
599bd596fa549d882aa8fc5104c322a75a3af728 jdk8u31-b11
f36c71a03e4ed467f630cc46d076a5bb4c58b6d5 jdk8u31-b12
ec36fa3b35eb00f053d624ae837579c6b8e446ac jdk8u31-b13
+34a64e22b81bd78cf29603a80ff1f4cfc1694df8 jdk8u31-b31
+d2b5784a3452a4fd9d1ccfefe93ee2d36662842c jdk8u31-b32
f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u40-b00
62468d841b842769d875bd97d10370585c296eb7 jdk8u40-b01
bdd9c38d1e61edbf770b8733b70a37d0cf0e7055 jdk8u40-b02
@@ -370,3 +374,19 @@ f9f70a0f60f48fbb95275b6c1110cedf740c6177 jdk8u40-b22
6ca090832d30fd0e46214ccc00816490ad75a8ab jdk8u40-b23
b2ce5df33715583c898530560d4202853b9ff9bc jdk8u40-b24
fb7b6c2b95c5661f15e8e747a63ec6d95d49fe46 jdk8u40-b25
+b142a2d8e35e54abb08a7ded1dbfb5d7ce534c93 jdk8u40-b26
+c2dd88e89edc85b1bcb731d3296d0fcec1b78447 jdk8u40-b27
+05a3614ed5276e5db2a73cce918be04b1a2922fb jdk8u45-b00
+21ec16eb7e6346c78b4fa67ccd6d2a9c58f0b696 jdk8u45-b01
+37b3ef9a07323afd2556d6837824db154cccc874 jdk8u45-b02
+ed3a4177da50d75d6da55ff521bf3f971cfe5214 jdk8u45-b03
+65f24dedfd29ec02af43f745742647412d90f005 jdk8u45-b04
+de2ee4c1341fd4eeaba39b81194df0c4274e7c8b jdk8u45-b05
+cf0097b8987d2d2f480d8a6d2a8f235509bd4421 jdk8u45-b06
+bb112473c7314146bebb75fb5220b4ec641b0b7a jdk8u45-b07
+8ab14ee47c8b1558854d3cd71006eceb6c6804d1 jdk8u45-b08
+397ea4a1bff8adbceaa1a40ff826b3d2d3b09e81 jdk8u45-b09
+c650c13d2bdf0e869ae86685de6bbb8a4e983ca3 jdk8u45-b10
+6ae873ddbe195aa966fc348e468c0ecd2702f5e3 jdk8u45-b11
+9b9fee0f99cd07fba62abaafe705665a5ab89067 jdk8u45-b12
+6fda38586f73de706ecde311711a587ac49d51d8 jdk8u45-b13
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index c34ce6b3..cd88baf5 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 ---