Merge jdk8u152-b08

Mon, 17 Jul 2017 14:13:07 -0700

author
asaha
date
Mon, 17 Jul 2017 14:13:07 -0700
changeset 3420
19eec1de09c1
parent 3417
4337c0d15fc8
parent 3419
df99c5186abe
child 3421
c7006b6b4e5a

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jul 10 15:55:24 2017 -0700
     1.2 +++ b/.hgtags	Mon Jul 17 14:13:07 2017 -0700
     1.3 @@ -709,11 +709,13 @@
     1.4  b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12
     1.5  9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13
     1.6  553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14
     1.7 +027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
     1.8  4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
     1.9  f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
    1.10  732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
    1.11  a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
    1.12  d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04
    1.13 +e0ed0609963aca47e766901d7ec57ab97b649567 jdk8u151-b05
    1.14  9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
    1.15  85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01
    1.16  2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Mon Jul 10 15:55:24 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Mon Jul 17 14:13:07 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