Merge mips-jdk8u262-b10

Wed, 14 Oct 2020 17:44:46 +0800

author
aoqi
date
Wed, 14 Oct 2020 17:44:46 +0800
changeset 1888
dde657df79e0
parent 1870
ab816b2056bd
parent 1887
7347ed2df76b
child 1889
c37997e762be

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Oct 14 16:43:13 2020 +0800
     1.2 +++ b/.hgtags	Wed Oct 14 17:44:46 2020 +0800
     1.3 @@ -1050,8 +1050,20 @@
     1.4  08cb9430f84f4fea71345a3be9408542d410f0da jdk8u252-b03
     1.5  966e128812aff4c0a4aa4aed7e0ec61dbb8c7953 jdk8u252-b04
     1.6  fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u252-b05
     1.7 +fac54385ffea4540bc79826ffed5b6d20d821ae5 jdk8u262-b00
     1.8  121cf3b001d9906c3ad92e690122a30dc39f2405 jdk8u252-b06
     1.9  e86a511a486e55c8492cffab649b70be870147fc jdk8u252-b07
    1.10  7e334946a044980685486099ac74a366752e73d1 jdk8u252-b08
    1.11 +b012193ff452cb51182f5f5c60ccbed0da6e3ef8 jdk8u252-b09
    1.12 +b012193ff452cb51182f5f5c60ccbed0da6e3ef8 jdk8u252-ga
    1.13  f93d1e4c19d0b036112dd368ae9399c28de4f6c4 mips64el-jdk8u252-b10
    1.14  0780937350c4dc41d068e028ab96fb987438ceb7 mips64el-jdk8u252-b11
    1.15 +c8d9ee34785849b4c71f788190b9e4e43f447311 jdk8u262-b01
    1.16 +ed881d547a807b49615df3f51fdcc0075309fc40 jdk8u262-b02
    1.17 +a708c11c582dce75a6b134e4dfb6f3f3aa05ef8d jdk8u262-b03
    1.18 +caa13cd34f715d6db597adca78732b94f3728bae jdk8u262-b04
    1.19 +96946cef7eade1693fe6dbd2e6001f36defb0295 jdk8u262-b05
    1.20 +0e54ba3037a2a8d5c93d8909aeaa75f9e55bf82a jdk8u262-b06
    1.21 +494c863af128b32c7462e49c32ce3a422033e4d2 jdk8u262-b07
    1.22 +cb41a9e2bafd0e332c5906dde9840816dc279b9c jdk8u262-b08
    1.23 +cd7ed8c648058a8fa01242d73e9754f455559c3e jdk8u262-b09
     2.1 --- a/THIRD_PARTY_README	Wed Oct 14 16:43:13 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Wed Oct 14 17:44:46 2020 +0800
     2.3 @@ -1643,7 +1643,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to GIFLIB 5.1.8 & libungif 4.1.3, 
     2.8 +%% This notice is provided with respect to GIFLIB 5.2.1 & libungif 4.1.3, 
     2.9  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -2898,23 +2898,21 @@
    2.13  
    2.14  -------------------------------------------------------------------------------
    2.15  
    2.16 -%% This notice is provided with respect to X Window System 6.8.2, which may be 
    2.17 +%% This notice is provided with respect to xwd v1.0.7, which may be
    2.18  included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
    2.19  
    2.20 +xwd utility
    2.21 +
    2.22  --- begin of LICENSE ---
    2.23  
    2.24 -This is the copyright for the files in src/solaris/native/sun/awt: list.h, 
    2.25 -multiVis.h, wsutils.h, list.c, multiVis.c
    2.26 -Copyright (c) 1994 Hewlett-Packard Co.
    2.27 -Copyright (c) 1996 X Consortium
    2.28 -
    2.29 -Permission is hereby granted, free of charge, to any person obtaining
    2.30 -a copy of this software and associated documentation files (the
    2.31 -"Software"), to deal in the Software without restriction, including
    2.32 -without limitation the rights to use, copy, modify, merge, publish,
    2.33 -distribute, sublicense, and sell copies of the Software, and to
    2.34 -permit persons to whom the Software is furnished to do so, subject to
    2.35 -the following conditions:
    2.36 +Copyright 1994 Hewlett-Packard Co.
    2.37 +Copyright 1996, 1998  The Open Group
    2.38 +
    2.39 +Permission to use, copy, modify, distribute, and sell this software and its
    2.40 +documentation for any purpose is hereby granted without fee, provided that
    2.41 +the above copyright notice appear in all copies and that both that
    2.42 +copyright notice and this permission notice appear in supporting
    2.43 +documentation.
    2.44  
    2.45  The above copyright notice and this permission notice shall be included
    2.46  in all copies or substantial portions of the Software.
    2.47 @@ -2922,15 +2920,15 @@
    2.48  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    2.49  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    2.50  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
    2.51 -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.52 +IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.53  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    2.54  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    2.55  OTHER DEALINGS IN THE SOFTWARE.
    2.56  
    2.57 -Except as contained in this notice, the name of the X Consortium shall
    2.58 +Except as contained in this notice, the name of The Open Group shall
    2.59  not be used in advertising or otherwise to promote the sale, use or
    2.60  other dealings in this Software without prior written authorization
    2.61 -from the X Consortium.
    2.62 +from The Open Group.
    2.63  
    2.64  --- end of LICENSE ---
    2.65  _____________________________

mercurial