Thu, 17 Oct 2019 13:46:48 +0100
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Sep 12 15:20:08 2019 -0400 1.2 +++ b/.hgtags Thu Oct 17 13:46:48 2019 +0100 1.3 @@ -974,3 +974,8 @@ 1.4 9611ccdff5fe10bb27e5aa34cde295562d13a29b jdk8u232-b04 1.5 2cd484c5b7f8463f5db0a73da92199255c212810 jdk8u232-b05 1.6 a29e19e1c0ee5eeb9c46c9158b395b4c10735157 jdk8u242-b00 1.7 +aa1559aa1f70d79e8bd4f3de9ab9a48fe1c0cc78 jdk8u232-b06 1.8 +54af8189b95d47ea2cf8bdc9d90fb02d46a1fd38 jdk8u232-b07 1.9 +7aea873d47e1d93c7ef4902e758417e5afc19d9c jdk8u232-b08 1.10 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-b09 1.11 +6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-ga
2.1 --- a/THIRD_PARTY_README Thu Sep 12 15:20:08 2019 -0400 2.2 +++ b/THIRD_PARTY_README Thu Oct 17 13:46:48 2019 +0100 2.3 @@ -2130,13 +2130,13 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1, 2.8 +%% This notice is provided with respect to PC/SC Lite v1.8.24, 2.9 which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris. 2.10 2.11 --- begin of LICENSE --- 2.12 2.13 -Copyright (c) 1999-2004 David Corcoran <corcoran@linuxnet.com> 2.14 -Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr> 2.15 +Copyright (c) 1999-2003 David Corcoran <corcoran@linuxnet.com> 2.16 +Copyright (c) 2001-2011 Ludovic Rousseau <ludovic.rousseau@free.fr> 2.17 All rights reserved. 2.18 2.19 Redistribution and use in source and binary forms, with or without 2.20 @@ -2148,15 +2148,10 @@ 2.21 2. Redistributions in binary form must reproduce the above copyright 2.22 notice, this list of conditions and the following disclaimer in the 2.23 documentation and/or other materials provided with the distribution. 2.24 -3. All advertising materials mentioning features or use of this software 2.25 - must display the following acknowledgement: 2.26 - This product includes software developed by: 2.27 - David Corcoran <corcoran@linuxnet.com> 2.28 - http://www.linuxnet.com (MUSCLE) 2.29 -4. The name of the author may not be used to endorse or promote products 2.30 +3. The name of the author may not be used to endorse or promote products 2.31 derived from this software without specific prior written permission. 2.32 2.33 -Changes to this license can be made only by the copyright author with 2.34 +Changes to this license can be made only by the copyright author with 2.35 explicit written consent. 2.36 2.37 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR