Merge

Thu, 13 Jul 2017 21:50:49 -0700

author
asaha
date
Thu, 13 Jul 2017 21:50:49 -0700
changeset 1441
cc36cc5570a8
parent 1440
417a8416b2a6
parent 1389
c57e086660a3
child 1442
5bc840ef8b2c

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jun 26 22:34:01 2017 -0700
     1.2 +++ b/.hgtags	Thu Jul 13 21:50:49 2017 -0700
     1.3 @@ -701,6 +701,7 @@
     1.4  d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12
     1.5  27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13
     1.6  65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14
     1.7 +c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
     1.8  ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00
     1.9  2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01
    1.10  b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02
     2.1 --- a/THIRD_PARTY_README	Mon Jun 26 22:34:01 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Thu Jul 13 21:50:49 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