tls
Thu Sep 28 01:41:34 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
N src/usr.bin/man/man.conf
C src/usr.bin/man/man.c
U src/usr.bin/man/man.1
U src/usr.bin/man/config.h
C src/usr.bin/man/config.c
I src/usr.bin/man/tags

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

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