Merge

Fri, 28 Apr 2017 14:02:52 -0700

author
asaha
date
Fri, 28 Apr 2017 14:02:52 -0700
changeset 2048
3f4399424f74
parent 2044
464351414239
parent 1945
6c30edf90d2f
child 2051
5380929d8628

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Mar 21 22:19:40 2017 -0700
     1.2 +++ b/.hgtags	Fri Apr 28 14:02:52 2017 -0700
     1.3 @@ -702,3 +702,8 @@
     1.4  94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11
     1.5  756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00
     1.6  b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01
     1.7 +3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02
     1.8 +68b47161333dea25ec15a302eb22749a85b07c55 jdk8u141-b03
     1.9 +571e02a10797c3d291054eca55ebc53bd12e3994 jdk8u141-b04
    1.10 +5346ed81542f2907b6d740ee22c8f1671c9d434a jdk8u141-b05
    1.11 +a4df4fcf824df487488cf2c6e8e8236116f4723f jdk8u141-b06
     2.1 --- a/THIRD_PARTY_README	Tue Mar 21 22:19:40 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Apr 28 14:02:52 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