Mercurial > hg > icedtea8-forest > nashorn
changeset 2205:59bf0950e077 jdk8u141-b32
Merge
author | asaha |
---|---|
date | Thu, 13 Jul 2017 08:57:55 -0700 |
parents | d9355e965222 (current diff) 6a52d202dfa3 (diff) |
children | b28cf209d6af |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 06 22:01:12 2017 -0700 +++ b/.hgtags Thu Jul 13 08:57:55 2017 -0700 @@ -700,4 +700,5 @@ 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14 +dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15 6f50b0c7c275324f76cf7f09606949195fd65f92 jdk8u141-b31
--- a/THIRD_PARTY_README Thu Jul 06 22:01:12 2017 -0700 +++ b/THIRD_PARTY_README Thu Jul 13 08:57:55 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