Merge

Fri, 14 Jul 2017 11:04:12 -0700

author
asaha
date
Fri, 14 Jul 2017 11:04:12 -0700
changeset 2178
87377d8b8101
parent 2173
a2c97f124213
parent 2086
178207e92304
child 2182
f38c44edbb11

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Sat Jul 01 00:00:08 2017 -0700
     1.2 +++ b/.hgtags	Fri Jul 14 11:04:12 2017 -0700
     1.3 @@ -700,6 +700,9 @@
     1.4  31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12
     1.5  2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13
     1.6  8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14
     1.7 +dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
     1.8  6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
     1.9  681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
    1.10  296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
    1.11 +c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03
    1.12 +a593aff280ac5472a23923604f1a25c8e80e6ec7 jdk8u151-b04
     2.1 --- a/THIRD_PARTY_README	Sat Jul 01 00:00:08 2017 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Jul 14 11:04:12 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