changeset 2053:f1021394489d jdk8u141-b32

Merge
author asaha
date Thu, 13 Jul 2017 08:43:00 -0700
parents 4fac68546764 9a342a4d9097
children f283f642a1dc
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 06 21:59:18 2017 -0700
+++ b/.hgtags	Thu Jul 13 08:43:00 2017 -0700
@@ -719,4 +719,5 @@
 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
+48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 123326194347f1778bbd124594bcddba8181d23b jdk8u141-b31
--- a/THIRD_PARTY_README	Thu Jul 06 21:59:18 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 08:43:00 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