aboutsummaryrefslogtreecommitdiff
path: root/docs/LICENSE-MIXING
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-07-07 05:43:04 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-07-07 05:43:04 +0000
commit6d8a208df29047b20cb2f8d836c3028578c2c394 (patch)
tree3913608fb472fd488f9067afefe48c90e49623c3 /docs/LICENSE-MIXING
parentc3a826fdcef1e64d9fe66877eb36c1649c4b886b (diff)
mention the exception only once ;-)
Diffstat (limited to 'docs/LICENSE-MIXING')
-rw-r--r--docs/LICENSE-MIXING11
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index 2ee7b3e2f..0f7f12ab6 100644
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -12,12 +12,11 @@ I am not a lawyer and this is not legal advice!
One common dilemma is that GPL[1]-licensed code is not allowed to be linked
with code licensed under the Original BSD license (with the announcement
-clause, unless there's a specified exception in the GPL-licensed module). You
-may still build your own copies that use them all, but distributing them as
-binaries would be to violate the GPL license - unless you accompany your
-license with an exception[2]. This particular problem was addressed when the
-Modified BSD license was created, which does not have the annoncement clause
-that collides with GPL.
+clause). You may still build your own copies that use them all, but
+distributing them as binaries would be to violate the GPL license - unless you
+accompany your license with an exception[2]. This particular problem was
+addressed when the Modified BSD license was created, which does not have the
+annoncement clause that collides with GPL.
libcurl http://curl.haxx.se/docs/copyright.html