Mercurial > hg > openjdk > jdk8u > hotspot
changeset 8470:2163b7e4a74f
Merge
author | asaha |
---|---|
date | Fri, 28 Apr 2017 14:03:33 -0700 |
parents | c4026db66abe (current diff) 42f196fd7c58 (diff) |
children | b5eef1d97c9e |
files | .hgtags |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Mar 21 13:36:05 2017 -0700 +++ b/.hgtags Fri Apr 28 14:03:33 2017 -0700 @@ -967,3 +967,8 @@ 829ea9b92cda9545652f1b309f56c57383024ebb jdk8u131-b11 692bc6b674dcab72453de08ee9da0856a7e41c0f jdk8u141-b00 0cee0db0180b64655751e7058c251103f9660f85 jdk8u141-b01 +82435799636c8b50a090aebcb5af49946afa7bb5 jdk8u141-b02 +678f11cc769eb79d35d49a94c769304df67a9cef jdk8u141-b03 +62b0b4a31b44e8b159bff106c04ecfabc9d78d9b jdk8u141-b04 +53a48dc8e4418ed422c69361193add798cb4ed55 jdk8u141-b05 +4b7067065b0ad08c41a6334b44877319cbb2de54 jdk8u141-b06
--- a/THIRD_PARTY_README Tue Mar 21 13:36:05 2017 -0700 +++ b/THIRD_PARTY_README Fri Apr 28 14:03:33 2017 -0700 @@ -3318,12 +3318,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-2013 Jean-loup Gailly and Mark Adler