From 89aaa1bb64ba8db54daf131749fe578e804d9382 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 7 Aug 2003 11:13:06 +0000 Subject: Move UCB-licensed code from 4-clause to 3-clause licence. Patches provided by Joel Baker in PR 22365, verified by myself. --- usr.bin/lam/lam.1 | 8 ++------ usr.bin/lam/lam.c | 10 +++------- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'usr.bin/lam') diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1 index f64d0a718ff..a99da83f71c 100644 --- a/usr.bin/lam/lam.1 +++ b/usr.bin/lam/lam.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: lam.1,v 1.4 2002/02/08 01:36:25 ross Exp $ +.\" $NetBSD: lam.1,v 1.5 2003/08/07 11:14:16 agc Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University 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/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index e77a87272d9..ae30ae17cc9 100644 --- a/usr.bin/lam/lam.c +++ b/usr.bin/lam/lam.c @@ -1,4 +1,4 @@ -/* $NetBSD: lam.c,v 1.3 1997/10/19 03:42:18 lukem Exp $ */ +/* $NetBSD: lam.c,v 1.4 2003/08/07 11:14:16 agc Exp $ */ /*- * Copyright (c) 1993 @@ -12,11 +12,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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\ #if 0 static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93"; #endif -__RCSID("$NetBSD: lam.c,v 1.3 1997/10/19 03:42:18 lukem Exp $"); +__RCSID("$NetBSD: lam.c,v 1.4 2003/08/07 11:14:16 agc Exp $"); #endif /* not lint */ /* -- cgit