Merge

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

author
asaha
date
Fri, 14 Jul 2017 11:54:20 -0700
changeset 2067
1d8ca36bed74
parent 2061
413d79cfbec1
parent 2066
45ebe647a00e
child 2068
88320e22020b

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jul 03 15:55:40 2017 -0700
     1.2 +++ b/.hgtags	Fri Jul 14 11:54:20 2017 -0700
     1.3 @@ -719,11 +719,15 @@
     1.4  96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
     1.5  1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
     1.6  68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
     1.7 +48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
     1.8 +123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
     1.9 +f1021394489da9a3621ba92fd427572abb32413f jdk8u141-b32
    1.10  b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
    1.11  0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
    1.12  9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
    1.13  00790ebdff1c5bc4cda000073b24f94dcc96e14f jdk8u161-b00
    1.14  66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
    1.15 +6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
    1.16  b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
    1.17  73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
    1.18  89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Mon Jul 03 15:55:40 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Jul 14 11:54: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.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