jtc
Wed Dec  7 00:35:21 PST 1994
Update of /b/source/CVS/src/usr.bin/tr
In directory sun-lamp.cs.berkeley.edu:/c/users/jtc/tr

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


jtc
Wed Dec  7 00:36:49 PST 1994
Update of /b/source/CVS/src/usr.bin/tput
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/tput/Makefile
U src/usr.bin/tput/clear.sh
I src/usr.bin/tput/tags
C src/usr.bin/tput/tput.1
C src/usr.bin/tput/tput.c

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

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