summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING6
-rw-r--r--ChangeLog1
2 files changed, 2 insertions, 5 deletions
diff --git a/COPYING b/COPYING
index b9d7f45..3afe554 100644
--- a/COPYING
+++ b/COPYING
@@ -12,11 +12,7 @@ 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 the NetBSD
- Foundation, Inc. and its contributors.
-4. Neither the name of The NetBSD Foundation nor the names of its
+3. Neither the name of The NetBSD Foundation nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
diff --git a/ChangeLog b/ChangeLog
index 80cfac5..d686ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2006-02-17 Alan Coopersmith <alan.coopersmith@sun.com>
* ucs2any.c:
+ * COPYING:
Sync license statement with NetBSD, which has removed advertising
clause from original NetBSD license. (See
http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/xsrc/xfree/xc/fonts/util/ucs2any.c?rev=1.9&content-type=text/plain and