Merge jdk8u141-b32

Thu, 13 Jul 2017 08:43:23 -0700

author
asaha
date
Thu, 13 Jul 2017 08:43:23 -0700
changeset 1611
1bbe5d997ab4
parent 1610
ae06acdb59c5
parent 1504
77461a27d91f
child 1612
514ad13bf4a8

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Jul 06 21:59:24 2017 -0700
     1.2 +++ b/.hgtags	Thu Jul 13 08:43:23 2017 -0700
     1.3 @@ -754,4 +754,5 @@
     1.4  87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
     1.5  ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
     1.6  2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
     1.7 +4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15
     1.8  e03501807899791ff7888884bcf47eb39be594bb jdk8u141-b31
     2.1 --- a/THIRD_PARTY_README	Thu Jul 06 21:59:24 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Thu Jul 13 08:43:23 2017 -0700
     2.3 @@ -2808,12 +2808,12 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to zlib v1.2.11, which may be included 
     2.8 +%% This notice is provided with respect to zlib v1.2.8, which may be included 
     2.9  with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12  
    2.13 -  version 1.2.11, January 15th, 2017
    2.14 +  version 1.2.8, April 28th, 2013
    2.15  
    2.16    Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
    2.17  

mercurial