Mercurial > hg > icedtea8-forest > jaxp
changeset 1698:228115c9db82 jdk8u152-b12
Merge
author | asaha |
---|---|
date | Tue, 15 Aug 2017 13:41:10 -0700 |
parents | 2963d0364932 (current diff) f1554c8d8b6d (diff) |
children | 8da26d3962f5 |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Aug 08 10:05:37 2017 -0700 +++ b/.hgtags Tue Aug 15 13:41:10 2017 -0700 @@ -724,6 +724,7 @@ 67150ea02ae49888b0300ef8baf2dcf90beb45ff jdk8u151-b06 838cb61b03b84ec86dd2685a40d7d278236946f5 jdk8u151-b07 4e43afdbc6017a6dd7be40e7a41cd0dd38a499a0 jdk8u151-b08 +31fae39926290b04fd8fe181a561c1621338358e jdk8u151-b09 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/THIRD_PARTY_README Tue Aug 08 10:05:37 2017 -0700 +++ b/THIRD_PARTY_README Tue Aug 15 13:41:10 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