changeset 1927:9f989dd43fc3 jdk8u222-b04-aarch32-190603

Merge
author snazarki
date Thu, 30 May 2019 18:02:32 +0300
parents 38e7bdc3f43d 1b43db192b99
children bce57aec149a
files .hgtags
diffstat 2 files changed, 6 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 30 18:01:37 2019 +0300
+++ b/.hgtags	Thu May 30 18:02:32 2019 +0300
@@ -1045,7 +1045,13 @@
 e46810124822721115f5bc683fed7d1cb3600290 jdk8u202-b26
 6aced976491d8f592e1d102eb222d29ea64fbd84 jdk8u202-ga
 2a7ec282f0ce1523347a9c9e08189139bfc097db jdk8u212-b00
+e41d4e43109e239cd13219b53798fdad651f63ef jdk8u222-b00
 e41d4e43109e239cd13219b53798fdad651f63ef jdk8u212-b01
 5d11a79b0bf5560625ec67efd40e9167a594b00d jdk8u212-b02
 b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-b03
 94e839bde586500905d807817788b820734a3f51 jdk8u212-b04-aarch32-190430
+7bcc11914fc5d23b20b9ee7fed6abc140eaab2cf jdk8u212-b04
+b6ed07cab3f88f5ff1c18ff26d27644102b6d63c jdk8u212-ga
+84cd6d251c41e399b526a39da5cd2dea3efe5ff6 jdk8u222-b01
+0c183329d0f6f692c6175afe13f8b1434152d381 jdk8u222-b02
+4c7079509eecb3127b5ddae9454dd6aab5a23e4d jdk8u222-b03
--- a/THIRD_PARTY_README	Tue Apr 30 18:01:37 2019 +0300
+++ b/THIRD_PARTY_README	Thu May 30 18:02:32 2019 +0300
@@ -2906,55 +2906,6 @@
 performance, or use of this material.
 
 */
-_____________________________________
-Copyright notice in keysym2ucs.h:
-
-Copyright 1987, 1994, 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.
-
-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 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 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 Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-*/
 
 --- end of LICENSE ---