Merge jdk8u152-b12

Tue, 15 Aug 2017 13:34:20 -0700

author
asaha
date
Tue, 15 Aug 2017 13:34:20 -0700
changeset 8845
cdfe7ec6f292
parent 8842
c91a8ac3f43f
parent 8844
e352e5438292
child 8846
baeb31a764eb

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Aug 08 10:04:51 2017 -0700
     1.2 +++ b/.hgtags	Tue Aug 15 13:34:20 2017 -0700
     1.3 @@ -984,6 +984,7 @@
     1.4  e1dc36cddcbc36b78e3d0558f87bbf459191e479 jdk8u151-b06
     1.5  e2a930243efa63b0a789e85a523e69574d53ac92 jdk8u151-b07
     1.6  158904fa31b28f1e027dc5b5a833ee673e89a84b jdk8u151-b08
     1.7 +8b0169692abbf8fb7972920cd79cee7dcab959c3 jdk8u151-b09
     1.8  5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00
     1.9  2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01
    1.10  58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Tue Aug 08 10:04:51 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Tue Aug 15 13:34:20 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.8, which may be included 
     2.8 +%% This notice is provided with respect to zlib v1.2.11, 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.8, April 28th, 2013
    2.14 +  version 1.2.11, January 15th, 2017
    2.15  
    2.16    Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
    2.17  

mercurial