changeset 1423:e14e868648cd jdk8u152-b12

Merge
author asaha
date Tue, 15 Aug 2017 13:41:44 -0700
parents 228b3796d9d5 (current diff) f910c0bf9da8 (diff)
children 269265f7a012
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 08 10:05:44 2017 -0700
+++ b/.hgtags	Tue Aug 15 13:41:44 2017 -0700
@@ -713,6 +713,7 @@
 2abea38c7ccedf1eabe9245ca9619cd006484a07 jdk8u151-b06
 4324e571f7fddf12b24fa8b9c4670ff1a3443b87 jdk8u151-b07
 1c0acbb50d5171b56c95b3abb2a92aee864beb35 jdk8u151-b08
+373e5d67f1f374a10d39e95963569db3949539e6 jdk8u151-b09
 ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00
 2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01
 b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02
--- a/THIRD_PARTY_README	Tue Aug 08 10:05:44 2017 -0700
+++ b/THIRD_PARTY_README	Tue Aug 15 13:41: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