From d36e97caf2141939cbd516d9f7802bb704f13f22 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 17 Feb 2006 15:58:37 +0000 Subject: 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 http://www.mail-archive.com/devel%40xfree86.org/msg07685.html ) --- ChangeLog | 8 ++++++++ ucs2any.c | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b71c82..80cfac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-17 Alan Coopersmith + + * ucs2any.c: + 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 + http://www.mail-archive.com/devel%40xfree86.org/msg07685.html ) + 2005-12-14 Kevin E. Martin * configure.ac: diff --git a/ucs2any.c b/ucs2any.c index 2e414d5..0437c5b 100644 --- a/ucs2any.c +++ b/ucs2any.c @@ -13,11 +13,7 @@ * 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. * -- cgit v1.2.1