changeset 1396:6089203bd3f3

Merge
author asaha
date Fri, 14 Jul 2017 10:45:53 -0700
parents eb94199102ea c57e086660a3
children 730acb5d508e f46811ccd812
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:30:12 2017 -0700
+++ b/.hgtags	Fri Jul 14 10:45:53 2017 -0700
@@ -701,6 +701,7 @@
 d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12
 27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13
 65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14
+c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15
 eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00
 c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01
 d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:30:12 2017 -0700
+++ b/THIRD_PARTY_README	Fri Jul 14 10:45:53 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