changeset 1499:8977426affc0 jdk8u151-b05

Merge
author asaha
date Fri, 14 Jul 2017 10:40:46 -0700
parents 2d66275684e3 77461a27d91f
children 1266bcf79421 342f18143f05
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:29:19 2017 -0700
+++ b/.hgtags	Fri Jul 14 10:40:46 2017 -0700
@@ -742,6 +742,7 @@
 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
+4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15
 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
 4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01
 ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:29:19 2017 -0700
+++ b/THIRD_PARTY_README	Fri Jul 14 10:40:46 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