changeset 1950:aee03466f2c2

Merge
author asaha
date Thu, 13 Jul 2017 21:46:21 -0700
parents f0dce56e00e9 9a342a4d9097
children 6d91dff0d6f1
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 26 22:32:04 2017 -0700
+++ b/.hgtags	Thu Jul 13 21:46:21 2017 -0700
@@ -707,6 +707,7 @@
 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
+48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
 73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
 89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jun 26 22:32:04 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 21:46:21 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