Merge

Thu, 13 Jul 2017 21:56:41 -0700

author
asaha
date
Thu, 13 Jul 2017 21:56:41 -0700
changeset 3452
b1c6368cfc97
parent 3451
a40ccf34f82d
parent 3401
4c355f7002c3
child 3453
9986bf97a48d

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jun 26 22:35:49 2017 -0700
     1.2 +++ b/.hgtags	Thu Jul 13 21:56:41 2017 -0700
     1.3 @@ -709,6 +709,7 @@
     1.4  b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12
     1.5  9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13
     1.6  553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14
     1.7 +027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
     1.8  9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
     1.9  85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01
    1.10  2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Mon Jun 26 22:35:49 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Thu Jul 13 21:56:41 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