changeset 1969:6d4ab2046f26 jdk8u151-b05

Merge
author asaha
date Fri, 14 Jul 2017 10:40:16 -0700
parents 9c1d88d986b9 9a342a4d9097
children d9e488a709c8 2a66e3ad63eb
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:29:14 2017 -0700
+++ b/.hgtags	Fri Jul 14 10:40:16 2017 -0700
@@ -707,6 +707,7 @@
 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
+48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
 9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:29:14 2017 -0700
+++ b/THIRD_PARTY_README	Fri Jul 14 10:40:16 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