Merge

Fri, 28 Apr 2017 14:04:50 -0700

author
asaha
date
Fri, 28 Apr 2017 14:04:50 -0700
changeset 1484
c248e1036898
parent 1479
943ecd77e3f5
parent 1375
86a22a62ecd5
child 1487
83fbd4b58140

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Mar 21 13:38:22 2017 -0700
     1.2 +++ b/.hgtags	Fri Apr 28 14:04:50 2017 -0700
     1.3 @@ -696,3 +696,8 @@
     1.4  7817f0d2519573e42405ef96a7c7ff1d768f92ec jdk8u131-b11
     1.5  74aa403ef03d56469e9364cc45c2ec18c6e50e33 jdk8u141-b00
     1.6  b1138396b99b1f8ebdb7d28c7143c96eb5b4f991 jdk8u141-b01
     1.7 +a7b9281956f9616eab0498386b9605853db7b408 jdk8u141-b02
     1.8 +3d27876c2ce476b16195c4519b266613f13e3e1b jdk8u141-b03
     1.9 +a08a6118b9df52f2963f482dbe6801d56b9086f7 jdk8u141-b04
    1.10 +dcbac02db203e4734921852aeed19416c7820f15 jdk8u141-b05
    1.11 +f552ee60279fa16d60477fc59c21fee8d298840a jdk8u141-b06
     2.1 --- a/THIRD_PARTY_README	Tue Mar 21 13:38:22 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Apr 28 14:04:50 2017 -0700
     2.3 @@ -3318,12 +3318,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-2013 Jean-loup Gailly and Mark Adler
    2.17  

mercurial