Mercurial > hg > openjdk > jdk8u
changeset 2415:34aa7bcd731f jdk8u242-b01
Merge
author | andrew |
---|---|
date | Thu, 17 Oct 2019 13:46:48 +0100 |
parents | 4ca097c49b1b (current diff) 42434f847608 (diff) |
children | d20799349800 |
files | .hgtags |
diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 12 15:20:08 2019 -0400 +++ b/.hgtags Thu Oct 17 13:46:48 2019 +0100 @@ -974,3 +974,8 @@ 9611ccdff5fe10bb27e5aa34cde295562d13a29b jdk8u232-b04 2cd484c5b7f8463f5db0a73da92199255c212810 jdk8u232-b05 a29e19e1c0ee5eeb9c46c9158b395b4c10735157 jdk8u242-b00 +aa1559aa1f70d79e8bd4f3de9ab9a48fe1c0cc78 jdk8u232-b06 +54af8189b95d47ea2cf8bdc9d90fb02d46a1fd38 jdk8u232-b07 +7aea873d47e1d93c7ef4902e758417e5afc19d9c jdk8u232-b08 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-b09 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-ga
--- a/THIRD_PARTY_README Thu Sep 12 15:20:08 2019 -0400 +++ b/THIRD_PARTY_README Thu Oct 17 13:46:48 2019 +0100 @@ -2130,13 +2130,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, +%% This notice is provided with respect to PC/SC Lite v1.8.24, which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. --- begin of LICENSE --- -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com> -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com> +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr> All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2148,15 +2148,10 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by: - David Corcoran <corcoran@linuxnet.com> - http://www.linuxnet.com (MUSCLE) -4. The name of the author may not be used to endorse or promote products +3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. -Changes to this license can be made only by the copyright author with +Changes to this license can be made only by the copyright author with explicit written consent. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR