From cf45f86e25c11cad8124d2f7c008ec7e1bd8781e Mon Sep 17 00:00:00 2001 From: root Date: Sat, 11 Jul 2009 14:24:13 +0000 Subject: license change --- LICENSE | 8 ++++---- coro.c | 2 +- coro.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 517f6d0..5c9c3bb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2000-2005 Marc Alexander Lehmann +Copyright (c) 2000-2009 Marc Alexander Lehmann Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: @@ -10,9 +10,6 @@ tion, are permitted provided that the following conditions are met: notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO @@ -24,3 +21,6 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Alternatively, the following files carry an additional notice that +explicitly allows relicensing under the GPLv2: coro.c, coro.h. + diff --git a/coro.c b/coro.c index 0298fe7..bea1bf0 100644 --- a/coro.c +++ b/coro.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2008 Marc Alexander Lehmann + * Copyright (c) 2001-2009 Marc Alexander Lehmann * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: diff --git a/coro.h b/coro.h index 33d5323..7f30150 100644 --- a/coro.h +++ b/coro.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2008 Marc Alexander Lehmann + * Copyright (c) 2001-2009 Marc Alexander Lehmann * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: -- cgit v1.2.3