Mercurial > hg > icedtea8-forest > nashorn
changeset 2145:7d9cb98c7f07 jdk8u152-b12
Merge
author | asaha |
---|---|
date | Tue, 15 Aug 2017 13:45:48 -0700 |
parents | b2f8061087cf (current diff) f41afee891a3 (diff) |
children | 704e8835c972 |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Aug 08 10:06:51 2017 -0700 +++ b/.hgtags Tue Aug 15 13:45:48 2017 -0700 @@ -700,6 +700,7 @@ b9ed966e2b873528553e27a791298205e1bc7cb5 jdk8u151-b06 0e94fe02e7596493459317fe13a782c1a4daa1be jdk8u151-b07 1f3aa2166cc45a091656795e0f022f2a049c6cae jdk8u151-b08 +34331f63b81e2a18c9241c762b9c92fd0bb8408e jdk8u151-b09 18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00 9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01 2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
--- a/THIRD_PARTY_README Tue Aug 08 10:06:51 2017 -0700 +++ b/THIRD_PARTY_README Tue Aug 15 13:45:48 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.8, which may be included +%% This notice is provided with respect to zlib v1.2.11, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.8, April 28th, 2013 + version 1.2.11, January 15th, 2017 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler