tls
Thu Sep 28 02:12:09 EDT 1995
Update of /a/cvsroot/src/usr.bin/man
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
U src/usr.bin/man/Makefile
U src/usr.bin/man/pathnames.h
I src/usr.bin/man/obj
U src/usr.bin/man/man.conf.5
U src/usr.bin/man/man.conf
U src/usr.bin/man/man.c
U src/usr.bin/man/man.1
U src/usr.bin/man/config.h
U src/usr.bin/man/config.c
I src/usr.bin/man/tags

No conflicts created by this import


tls
Thu Sep 28 02:13:39 EDT 1995
Update of /a/cvsroot/src/usr.bin/mkstr
In directory pain.lcs.mit.edu:/a/users/tls/tmp

Revision/Branch: 1.1.1

Log Message:
imported from 44lite2

Status:

Vendor Tag:	CSRG
Release Tags:	lite-2
		
I src/usr.bin/mkstr/tags
I src/usr.bin/mkstr/obj
C src/usr.bin/mkstr/mkstr.c
C src/usr.bin/mkstr/mkstr.1
C src/usr.bin/mkstr/Makefile

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

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


perry
Thu Sep 28 02:19:58 EDT 1995
Update of /a/cvsroot/src/usr.bin/du
In directory pain.lcs.mit.edu:/a/users/perry/NetBSD/du

Modified Files:
	Makefile du.c 
Log Message:
Sync with 4.4BSD-Lite2