# HG changeset patch # User asaha # Date 1500055452 25200 # Node ID 87377d8b81016858f12882c8a2bc9e229966051c # Parent a2c97f124213839da21a1c62235244663f7e17f2# Parent 178207e92304e6717c1b2e80c56424efe4e69204 Merge diff -r a2c97f124213 -r 87377d8b8101 .hgtags --- a/.hgtags Sat Jul 01 00:00:08 2017 -0700 +++ b/.hgtags Fri Jul 14 11:04:12 2017 -0700 @@ -700,6 +700,9 @@ 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14 +dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15 6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00 681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01 296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02 +c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03 +a593aff280ac5472a23923604f1a25c8e80e6ec7 jdk8u151-b04 diff -r a2c97f124213 -r 87377d8b8101 THIRD_PARTY_README --- a/THIRD_PARTY_README Sat Jul 01 00:00:08 2017 -0700 +++ b/THIRD_PARTY_README Fri Jul 14 11:04:12 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.11, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.11, January 15th, 2017 + version 1.2.8, April 28th, 2013 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler