From 481fa19a24ad0c0d4235958a8d3d3a9bb57bc607 Mon Sep 17 00:00:00 2001 From: valeriep Date: Wed, 26 Jun 2019 01:15:51 +0000 Subject: [PATCH] 8226607: Inconsistent info between pcsclite.md and MUSCLE headers Summary: Updated the info based on MUSCLE v1.8.24 Reviewed-by: ascarpino --- THIRD_PARTY_README | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index eddee26..7dc54a0 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -2130,13 +2130,13 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice ------------------------------------------------------------------------------- -%% 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 -Copyright (c) 1999-2004 Ludovic Rousseau +Copyright (c) 1999-2003 David Corcoran +Copyright (c) 2001-2011 Ludovic Rousseau All rights reserved. Redistribution and use in source and binary forms, with or without @@ -2148,15 +2148,10 @@ are met: 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 - 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 -- GitLab