changeset 1550:122a325c8bea jdk8u152-b12

Merge
author asaha
date Tue, 15 Aug 2017 13:32:44 -0700
parents d7628d281f05 05a4bb70c2d8
children aaffd0708c89
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 08 10:04:32 2017 -0700
+++ b/.hgtags	Tue Aug 15 13:32:44 2017 -0700
@@ -754,6 +754,7 @@
 3289ad7e88f3aa38fdaa4910e9eeed5e1e5430b1 jdk8u151-b06
 d41040488bbb511d64c6c2533d642e52675edfde jdk8u151-b07
 5d079476bf24cb8143473d2a0880e0b2e032b1eb jdk8u151-b08
+c5f095a1df38d9be119adcab5bbd7e4365e21871 jdk8u151-b09
 58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
 a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
 8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
--- a/THIRD_PARTY_README	Tue Aug 08 10:04:32 2017 -0700
+++ b/THIRD_PARTY_README	Tue Aug 15 13:32:44 2017 -0700
@@ -2808,12 +2808,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.8, which may be included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler