diff options
| author | tls <tls@NetBSD.org> | 1997-01-09 14:39:10 +0000 |
|---|---|---|
| committer | tls <tls@NetBSD.org> | 1997-01-09 14:39:10 +0000 |
| commit | 5445d0188bcbd59fd2fdc0d5e8dc8963f6514b54 (patch) | |
| tree | 3e9cf4b3352999aa6d422a30b72bd371784e3c94 /usr.bin/paste | |
| parent | 20d490585f8fb29ea642e969d84ca9933f1a732c (diff) | |
Sync to 4.4BSD-Lite2
Diffstat (limited to 'usr.bin/paste')
| -rw-r--r-- | usr.bin/paste/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/paste/paste.1 | 12 | ||||
| -rw-r--r-- | usr.bin/paste/paste.c | 16 |
3 files changed, 18 insertions, 14 deletions
diff --git a/usr.bin/paste/Makefile b/usr.bin/paste/Makefile index f1c10d9e0cc..1650a788253 100644 --- a/usr.bin/paste/Makefile +++ b/usr.bin/paste/Makefile @@ -1,5 +1,5 @@ -# from: @(#)Makefile 5.1 (Berkeley) 5/11/90 -# $Id: Makefile,v 1.2 1993/08/01 05:38:01 mycroft Exp $ +# $NetBSD: Makefile,v 1.3 1997/01/09 14:43:19 tls Exp $ +# from: @(#)Makefile 8.1 (Berkeley) 6/6/93 PROG= paste diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1 index 6da0ff8d66f..f5c1238a8af 100644 --- a/usr.bin/paste/paste.1 +++ b/usr.bin/paste/paste.1 @@ -1,5 +1,7 @@ -.\" Copyright (c) 1989, 1990 The Regents of the University of California. -.\" All rights reserved. +.\" $NetBSD: paste.1,v 1.3 1997/01/09 14:43:20 tls Exp $ +.\" +.\" Copyright (c) 1989, 1990, 1993 +.\" The Regents of the University of California. All rights reserved. .\" .\" This code is derived from software contributed to Berkeley by .\" Adam S. Moskowitz and the Institute of Electrical and Electronics @@ -33,10 +35,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)paste.1 5.6 (Berkeley) 7/27/91 -.\" $Id: paste.1,v 1.2 1993/08/01 07:29:57 mycroft Exp $ +.\" from: @(#)paste.1 8.1 (Berkeley) 6/6/93 +.\" $NetBSD: paste.1,v 1.3 1997/01/09 14:43:20 tls Exp $ .\" -.Dd July 27, 1991 +.Dd June 6, 1993 .Dt PASTE 1 .Os .Sh NAME diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 014d9fb97dd..fc031765012 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -1,6 +1,8 @@ +/* $NetBSD: paste.c,v 1.3 1997/01/09 14:43:21 tls Exp $ */ + /* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Adam S. Moskowitz of Menlo Consulting. @@ -35,14 +37,14 @@ */ #ifndef lint -char copyright[] = -"@(#) Copyright (c) 1989 The Regents of the University of California.\n\ - All rights reserved.\n"; +static char copyright[] = +"@(#) Copyright (c) 1989, 1993\n\ + The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint -/*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/ -static char rcsid[] = "$Id: paste.c,v 1.2 1993/08/01 18:10:14 mycroft Exp $"; +/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/ +static char rcsid[] = "$NetBSD: paste.c,v 1.3 1997/01/09 14:43:21 tls Exp $"; #endif /* not lint */ #include <sys/types.h> |
