Mercurial > hg > icedtea8-forest > corba

changeset 2092:aecb9137265a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u262-b01
author andrew
date Sun, 21 Jun 2020 23:40:09 +0100
parents de87f3555d1c (current diff) 644b5985f127 (diff)
children e1696465ea34
files .hgtags
diffstat 2 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat May 02 19:27:56 2020 +0100
+++ b/.hgtags	Sun Jun 21 23:40:09 2020 +0100
@@ -1135,6 +1135,7 @@
 e612032f8f28daa0a41df1fd69ca4c94f64280ff jdk8u252-b03
 4eb5558f0f4fc6602ed0d01df95aeae1e77364c6 jdk8u252-b04
 b2c092b72c7c6a6fdcf99acb9feb31b807b24772 jdk8u252-b05
+b2c092b72c7c6a6fdcf99acb9feb31b807b24772 jdk8u262-b00
 ff8c2e73d641368a30508a038c4cf57391ef076a jdk8u252-b06
 ee99eeee44ad1b13088f8c70711668f0cdee7821 jdk8u252-b07
 63738d15bb7f5e30917754acd19c52a77265bcdb jdk8u252-b08
--- a/THIRD_PARTY_README	Sat May 02 19:27:56 2020 +0100
+++ b/THIRD_PARTY_README	Sun Jun 21 23:40:09 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 ---
 _____________________________