changeset 1678:e1412055ece9 jdk8u141-b32

Merge
author asaha
date Thu, 13 Jul 2017 08:53:25 -0700
parents 411643aa5c6b 4fe0f48f801c
children dbf392666358
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 06 22:00:15 2017 -0700
+++ b/.hgtags	Thu Jul 13 08:53:25 2017 -0700
@@ -724,4 +724,5 @@
 790fea8778f49a14e461ef9897109395d7b8ae30 jdk8u141-b12
 5c33c65a916e02794d3d0c82648bbb8138e20023 jdk8u141-b13
 a907feb04fc1f737117deb331dabb32eb5d68f43 jdk8u141-b14
+5790500308c0e7c2e7f1068c5ff5c76c1d54497d jdk8u141-b15
 e2652eebd4bd5bcf42c3b7f63720e62af02d306e jdk8u141-b31
--- a/THIRD_PARTY_README	Thu Jul 06 22:00:15 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 08:53:25 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