jtc
Thu Dec  8 17:43:40 PST 1994
Update of /b/source/CVS/src/usr.bin/tee
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tee

Modified Files:
	Makefile tee.1 tee.c 
Log Message:
Merged with 4.4lite.
Changed to conform to NetBSD's new RCS Id convention.


jtc
Thu Dec  8 17:45:37 PST 1994
Update of /b/source/CVS/src/usr.bin/tcopy
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/tcopy/Makefile
C src/usr.bin/tcopy/pathnames.h
I src/usr.bin/tcopy/tags
C src/usr.bin/tcopy/tcopy.1
C src/usr.bin/tcopy/tcopy.c

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

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


jtc
Thu Dec  8 17:47:04 PST 1994
Update of /b/source/CVS/src/usr.bin/talk
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 4.4lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/usr.bin/talk/Makefile
C src/usr.bin/talk/ctl.c
C src/usr.bin/talk/ctl_transact.c
C src/usr.bin/talk/display.c
C src/usr.bin/talk/get_addrs.c
C src/usr.bin/talk/get_names.c
C src/usr.bin/talk/init_disp.c
C src/usr.bin/talk/invite.c
C src/usr.bin/talk/io.c
C src/usr.bin/talk/look_up.c
C src/usr.bin/talk/msgs.c
I src/usr.bin/talk/tags
C src/usr.bin/talk/talk.1
C src/usr.bin/talk/talk.c
C src/usr.bin/talk/talk.h
C src/usr.bin/talk/talk_ctl.h

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

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