changeset 1598:1bbe5d997ab4 jdk8u141-b32

Merge
author asaha
date Thu, 13 Jul 2017 08:43:23 -0700
parents ae06acdb59c5 77461a27d91f
children 514ad13bf4a8
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 06 21:59:24 2017 -0700
+++ b/.hgtags	Thu Jul 13 08:43:23 2017 -0700
@@ -754,4 +754,5 @@
 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
+4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15
 e03501807899791ff7888884bcf47eb39be594bb jdk8u141-b31
--- a/THIRD_PARTY_README	Thu Jul 06 21:59:24 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 08:43:23 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