changeset 1642:198e9056e731

Merge
author asaha
date Thu, 13 Jul 2017 21:46:45 -0700
parents d5fd110a8674 77461a27d91f
children 86b1cd17fde7
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 26 22:32:15 2017 -0700
+++ b/.hgtags	Thu Jul 13 21:46:45 2017 -0700
@@ -742,6 +742,7 @@
 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
+4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15
 58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
 a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
 8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jun 26 22:32:15 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 21:46:45 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