# HG changeset patch # User asaha # Date 1500055215 25200 # Node ID 342f18143f0554578906c2373079c90b15f3a705 # Parent 55af752b91b055ec9ff669b1120400a2c5df45ef# Parent 8977426affc02fdf74b1163865059ec86ddccb61 Merge diff -r 55af752b91b0 -r 342f18143f05 .hgtags --- a/.hgtags Fri Jun 30 23:56:12 2017 -0700 +++ b/.hgtags Fri Jul 14 11:00:15 2017 -0700 @@ -754,6 +754,9 @@ 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14 +4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00 4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01 ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02 +a6814326f989837019ff7dd0d9b0e57065499bc5 jdk8u151-b03 +cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04 diff -r 55af752b91b0 -r 342f18143f05 THIRD_PARTY_README --- a/THIRD_PARTY_README Fri Jun 30 23:56:12 2017 -0700 +++ b/THIRD_PARTY_README Fri Jul 14 11:00:15 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