tls
Thu Jan  9 06:40:48 PST 1997
Update of /a/cvsroot/src/usr.bin/paste
In directory netbsd1:/var/slash-tmp/cvs-serv3199

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/paste/paste.c
C src/usr.bin/paste/paste.1
C src/usr.bin/paste/Makefile

3 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/paste


tls
Thu Jan  9 06:43:22 PST 1997
Update of /a/cvsroot/src/usr.bin/paste
In directory netbsd1:/var/slash-tmp/cvs-serv3368

Modified Files:
	Makefile paste.1 paste.c 
Log Message:
Sync to 4.4BSD-Lite2

tls
Thu Jan  9 06:47:53 PST 1997
Update of /a/cvsroot/src/usr.bin/patch
In directory netbsd1:/var/slash-tmp/cvs-serv3784

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/patch/Makefile
C src/usr.bin/patch/common.h
C src/usr.bin/patch/patch.c
C src/usr.bin/patch/config.h
C src/usr.bin/patch/README
C src/usr.bin/patch/INTERN.h
C src/usr.bin/patch/EXTERN.h
C src/usr.bin/patch/inp.c
C src/usr.bin/patch/inp.h
C src/usr.bin/patch/patch.1
C src/usr.bin/patch/patchlevel.h
C src/usr.bin/patch/pch.c
C src/usr.bin/patch/pch.h
C src/usr.bin/patch/util.c
C src/usr.bin/patch/util.h
C src/usr.bin/patch/version.c
C src/usr.bin/patch/version.h

17 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/patch


tls
Thu Jan  9 06:49:48 PST 1997
Update of /a/cvsroot/src/usr.bin/pr
In directory netbsd1:/var/slash-tmp/cvs-serv4051

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
C src/usr.bin/pr/egetopt.c
C src/usr.bin/pr/extern.h
C src/usr.bin/pr/Makefile
C src/usr.bin/pr/pr.1
C src/usr.bin/pr/pr.c
C src/usr.bin/pr/pr.h

6 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/usr.bin/pr