Mercurial > hg > openjdk > jdk8u > hotspot
changeset 8496:ae8cae699f62 jdk8u141-b32
Merge
author | asaha |
---|---|
date | Thu, 13 Jul 2017 08:44:24 -0700 |
parents | 7625d5f8ebc1 (current diff) eea89df81a8e (diff) |
children | 7245ee7fa44a |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 06 21:59:38 2017 -0700 +++ b/.hgtags Thu Jul 13 08:44:24 2017 -0700 @@ -984,4 +984,5 @@ d6e7c7d2c6f69906b4cb643a6813eccba0de988f jdk8u141-b12 df6af363337eff5b22ae7940b0981231fdf5dfb4 jdk8u141-b13 3a1543e089c32592be9c201c6e021295fbf5fdc1 jdk8u141-b14 +23f1790147d838ddb1133cc79dc08e7c9ba5ab44 jdk8u141-b15 9ffa0d7ed932045a0b4ceb095fb52444eed39c1b jdk8u141-b31
--- a/THIRD_PARTY_README Thu Jul 06 21:59:38 2017 -0700 +++ b/THIRD_PARTY_README Thu Jul 13 08:44:24 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