Merge

Fri, 14 Jul 2017 11:54:44 -0700

author
asaha
date
Fri, 14 Jul 2017 11:54:44 -0700
changeset 1614
cf7c1617aaf6
parent 1608
66f22063cf42
parent 1613
907c6ac9ac0b
child 1615
95385ecb9640

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jul 03 15:55:58 2017 -0700
     1.2 +++ b/.hgtags	Fri Jul 14 11:54:44 2017 -0700
     1.3 @@ -754,10 +754,14 @@
     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
     1.9 +1bbe5d997ab4e030dd961ab78e11ddae1bc6786c jdk8u141-b32
    1.10  2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
    1.11  4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01
    1.12  ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02
    1.13  a6814326f989837019ff7dd0d9b0e57065499bc5 jdk8u151-b03
    1.14 +cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04
    1.15  58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
    1.16  a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
    1.17  8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Mon Jul 03 15:55:58 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Jul 14 11:54:44 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