summaryrefslogtreecommitdiff
path: root/usr.bin/paste
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
committeragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
commit89aaa1bb64ba8db54daf131749fe578e804d9382 (patch)
tree57ca36a9ec77286fc0094f173063d9b41f7f765b /usr.bin/paste
parent075022b349321510ad14036d70908681ed02f117 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22365, verified by myself.
Diffstat (limited to 'usr.bin/paste')
-rw-r--r--usr.bin/paste/paste.110
-rw-r--r--usr.bin/paste/paste.c10
2 files changed, 6 insertions, 14 deletions
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index e12d90587aa..2cfd0b219aa 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: paste.1,v 1.6 2002/02/08 01:36:30 ross Exp $
+.\" $NetBSD: paste.1,v 1.7 2003/08/07 11:15:28 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -15,11 +15,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.
.\"
@@ -36,7 +32,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)paste.1 8.1 (Berkeley) 6/6/93
-.\" $NetBSD: paste.1,v 1.6 2002/02/08 01:36:30 ross Exp $
+.\" $NetBSD: paste.1,v 1.7 2003/08/07 11:15:28 agc Exp $
.\"
.Dd June 6, 1993
.Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index d3abe02b677..6aaa30f49c8 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,4 @@
-/* $NetBSD: paste.c,v 1.6 1998/10/13 17:02:16 wsanchez Exp $ */
+/* $NetBSD: paste.c,v 1.7 2003/08/07 11:15:28 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,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.
*
@@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/
-__RCSID("$NetBSD: paste.c,v 1.6 1998/10/13 17:02:16 wsanchez Exp $");
+__RCSID("$NetBSD: paste.c,v 1.7 2003/08/07 11:15:28 agc Exp $");
#endif /* not lint */
#include <sys/types.h>