Mercurial > hg > icedtea8-forest > nashorn
changeset 2078:178207e92304 jdk8u151-b05
Merge
author | asaha |
---|---|
date | Fri, 14 Jul 2017 10:47:20 -0700 |
parents | 280b4c86659e (current diff) 6a52d202dfa3 (diff) |
children | 9537bf349d55 87377d8b8101 |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 10 15:30:58 2017 -0700 +++ b/.hgtags Fri Jul 14 10:47:20 2017 -0700 @@ -688,6 +688,7 @@ 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14 +dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15 6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00 681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01 296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
--- a/THIRD_PARTY_README Mon Jul 10 15:30:58 2017 -0700 +++ b/THIRD_PARTY_README Fri Jul 14 10:47:20 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.11, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.11, January 15th, 2017 + version 1.2.8, April 28th, 2013 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler