Mercurial > hg > openjdk > jdk8u
changeset 1971:8f1aee9f3d07 jdk8u152-b08
Merge
author | asaha |
---|---|
date | Mon, 17 Jul 2017 13:56:35 -0700 |
parents | 86b599479fd8 (current diff) d9e488a709c8 (diff) |
children | f697ab795355 |
files | .hgtags |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 10 15:53:45 2017 -0700 +++ b/.hgtags Mon Jul 17 13:56:35 2017 -0700 @@ -707,11 +707,13 @@ 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14 +48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02 66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03 6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04 +6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05 b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00 73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01 89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
--- a/THIRD_PARTY_README Mon Jul 10 15:53:45 2017 -0700 +++ b/THIRD_PARTY_README Mon Jul 17 13:56:35 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