summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2006-09-21 17:21:18 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2006-09-21 17:21:18 +0000
commit23ef10def9f0fd261ccb1aff757dfd23e793fdae (patch)
treef95efb5820b3af3a108b1110741f500ca88c2133 /COPYING
parent2f4763ccd6b0b0025463eb50439b633791de10fe (diff)
COPYING, AUTHORS: credit L. Peter Deutsch for libmd5-rfc and include its license
Also add myself to AUTHORS 20060921172118-53eee-dc6c619c52eb28d52665649a4188618b9e1dd947.gz
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING41
1 files changed, 1 insertions, 40 deletions
diff --git a/COPYING b/COPYING
index 524295e7b..2d2d780e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,3 @@
-Most of Gabble is licensed under the GNU Lesser General Public License,
-as published by the Free Software Foundation and reproduced below:
-either version 2.1 of the License, or (at your option) any later version.
-
-Gabble incorporates a SHA1 implementation by Allan Saddi, taken from
-sha v1.0.4 (in the directory src/sha). This is released under a BSD-style
-license also reproduced below.
-
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
@@ -516,34 +507,4 @@ if necessary. Here is a sample; alter the names:
That's all there is to it!
-------------------------------------------------------------------------
-
-License of src/sha1:
-
-/*-
- * Copyright (c) 2001-2003 Allan Saddi <allan@saddi.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL ALLAN SADDI OR HIS CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: sha1.h 347 2003-02-23 22:11:49Z asaddi $
- */
+