changeset 2180:e0333285c8a9 tip

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 03 Feb 2018 14:01:52 -0800
parents 8c6475db7b62 4f71319024ba
children
files .hgtags
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 07 23:37:13 2017 -0700
+++ b/.hgtags	Sat Feb 03 14:01:52 2018 -0800
@@ -616,3 +616,5 @@
 ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02
 4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00
 205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01
+6f72d747fa58d54e2d2e27755c0bcf2c7291682f jdk7u161-b00
+e162e8d76cdd9f579e25f307f5485550fec2d024 jdk7u161-b01
--- a/THIRD_PARTY_README	Thu Sep 07 23:37:13 2017 -0700
+++ b/THIRD_PARTY_README	Sat Feb 03 14:01:52 2018 -0800
@@ -3134,14 +3134,14 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.3, which is included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 7, JDK 7, and OpenJDK 7
 
 --- begin of LICENSE ---
-
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ 
+  version 1.2.11, January 15th, 2017
+
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages