Mercurial > hg > icedtea8-forest > hotspot
changeset 9694:cdfe7ec6f292 jdk8u152-b12
Merge
author | asaha |
---|---|
date | Tue, 15 Aug 2017 13:34:20 -0700 |
parents | c91a8ac3f43f (current diff) e352e5438292 (diff) |
children | baeb31a764eb |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Aug 08 10:04:51 2017 -0700 +++ b/.hgtags Tue Aug 15 13:34:20 2017 -0700 @@ -984,6 +984,7 @@ e1dc36cddcbc36b78e3d0558f87bbf459191e479 jdk8u151-b06 e2a930243efa63b0a789e85a523e69574d53ac92 jdk8u151-b07 158904fa31b28f1e027dc5b5a833ee673e89a84b jdk8u151-b08 +8b0169692abbf8fb7972920cd79cee7dcab959c3 jdk8u151-b09 5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00 2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01 58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
--- a/THIRD_PARTY_README Tue Aug 08 10:04:51 2017 -0700 +++ b/THIRD_PARTY_README Tue Aug 15 13:34:20 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