changeset 8567:259c36bd7aea

Merge
author asaha
date Thu, 13 Jul 2017 21:47:40 -0700
parents 9c12db83d77d eea89df81a8e
children 9e265c181b19
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 26 22:32:46 2017 -0700
+++ b/.hgtags	Thu Jul 13 21:47:40 2017 -0700
@@ -972,6 +972,7 @@
 d6e7c7d2c6f69906b4cb643a6813eccba0de988f jdk8u141-b12
 df6af363337eff5b22ae7940b0981231fdf5dfb4 jdk8u141-b13
 3a1543e089c32592be9c201c6e021295fbf5fdc1 jdk8u141-b14
+23f1790147d838ddb1133cc79dc08e7c9ba5ab44 jdk8u141-b15
 5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00
 2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01
 58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jun 26 22:32:46 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 21:47:40 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