bagder: curl/docs LICENSE-MIXING,1.3,1.4

Update of /cvsroot/curl/curl/docs
In directory labb:/tmp/cvs-serv15301

Modified Files:
        LICENSE-MIXING 
Log Message:
mention the exception only once ;-)


Index: LICENSE-MIXING
===================================================================
RCS file: /cvsroot/curl/curl/docs/LICENSE-MIXING,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LICENSE-MIXING      7 Apr 2005 15:28:56 -0000       1.3
+++ LICENSE-MIXING      7 Jul 2005 05:43:04 -0000       1.4
@@ -12,12 +12,11 @@
 
 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
 

_______________________________________________
http://cool.haxx.se/mailman/listinfo/curl-commits