changeset 3515:09c245999161 jdk8u141-b32

Merge
author asaha
date Thu, 13 Jul 2017 08:57:30 -0700
parents a2c5e219eccf 4c355f7002c3
children 16d3ee8f1b51
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 06 22:01:04 2017 -0700
+++ b/.hgtags	Thu Jul 13 08:57:30 2017 -0700
@@ -721,4 +721,5 @@
 b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12
 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13
 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14
+027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
 716e712f0db45c8231208bc70ab4d2a8a40c4d3a jdk8u141-b31
--- a/THIRD_PARTY_README	Thu Jul 06 22:01:04 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 08:57:30 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