changeset 1996:cac1d314101a

Merge jdk8u262-b01
author andrew
date Sun, 21 Jun 2020 23:40:12 +0100
parents d21649c1e0ae (current diff) c8d9ee347858 (diff)
children accca84b727d
files .hgtags
diffstat 2 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat May 02 19:27:59 2020 +0100
+++ b/.hgtags	Sun Jun 21 23:40:12 2020 +0100
@@ -1093,6 +1093,7 @@
 08cb9430f84f4fea71345a3be9408542d410f0da jdk8u252-b03
 966e128812aff4c0a4aa4aed7e0ec61dbb8c7953 jdk8u252-b04
 fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u252-b05
+fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u262-b00
 121cf3b001d9906c3ad92e690122a30dc39f2405 jdk8u252-b06
 e86a511a486e55c8492cffab649b70be870147fc jdk8u252-b07
 7e334946a044980685486099ac74a366752e73d1 jdk8u252-b08
--- a/THIRD_PARTY_README	Sat May 02 19:27:59 2020 +0100
+++ b/THIRD_PARTY_README	Sun Jun 21 23:40:12 2020 +0100
@@ -2898,23 +2898,21 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to X Window System 6.8.2, which may be 
+%% This notice is provided with respect to xwd v1.0.7, which may be
 included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
 
+xwd utility
+
 --- begin of LICENSE ---
 
-This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
-multiVis.h, wsutils.h, list.c, multiVis.c
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright 1994 Hewlett-Packard Co.
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
 
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
@@ -2922,15 +2920,15 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
 OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-Except as contained in this notice, the name of the X Consortium shall
+Except as contained in this notice, the name of The Open Group shall
 not be used in advertising or otherwise to promote the sale, use or
 other dealings in this Software without prior written authorization
-from the X Consortium.
+from The Open Group.
 
 --- end of LICENSE ---
 _____________________________