changeset 1619:907603d832ac

Merge
author asaha
date Thu, 13 Jul 2017 21:50:22 -0700
parents d6de6e9fb786 4fe0f48f801c
children c01deaf7d93a
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jun 26 22:33:49 2017 -0700
+++ b/.hgtags	Thu Jul 13 21:50:22 2017 -0700
@@ -712,6 +712,7 @@
 790fea8778f49a14e461ef9897109395d7b8ae30 jdk8u141-b12
 5c33c65a916e02794d3d0c82648bbb8138e20023 jdk8u141-b13
 a907feb04fc1f737117deb331dabb32eb5d68f43 jdk8u141-b14
+5790500308c0e7c2e7f1068c5ff5c76c1d54497d jdk8u141-b15
 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00
 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01
 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jun 26 22:33:49 2017 -0700
+++ b/THIRD_PARTY_README	Thu Jul 13 21:50:22 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