Mercurial > hg > openjdk > aarch64-port > nashorn
changeset 1460:a6d6f7cf488c jdk8u51-b03
Merge
author | asaha |
---|---|
date | Wed, 11 Mar 2015 14:08:24 -0700 |
parents | 71551db96edd (diff) 294b60e6e4be (current diff) |
children | cb7144e658b8 |
files | .hgtags |
diffstat | 2 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 11 13:49:07 2015 -0700 +++ b/.hgtags Wed Mar 11 14:08:24 2015 -0700 @@ -369,3 +369,18 @@ fb7b6c2b95c5661f15e8e747a63ec6d95d49fe46 jdk8u40-b25 b142a2d8e35e54abb08a7ded1dbfb5d7ce534c93 jdk8u40-b26 e05552220ba82e465a1abfee90224b5b247e37bc jdk8u40-b31 +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 +2d1c01990ebd896f81f511aabf1e53cbe1fda11f jdk8u51-b00 +4323de82a85c378b08e24601b8f3cec6aafda6f4 jdk8u51-b01 +5ee412753fa08a1e9fa15221c4253886e822a94e jdk8u51-b02
--- a/THIRD_PARTY_README Wed Mar 11 13:49:07 2015 -0700 +++ b/THIRD_PARTY_README Wed Mar 11 14:08:24 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 ---