jtc
Wed Nov 30 11:11:53 PST 1994
Update of /b/source/CVS/src/share/man/man5
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/share/man/man5/Makefile
C src/share/man/man5/a.out.5
C src/share/man/man5/acct.5
C src/share/man/man5/core.5
C src/share/man/man5/dir.5
C src/share/man/man5/disktab.5
C src/share/man/man5/fs.5
C src/share/man/man5/fstab.5
C src/share/man/man5/group.5
C src/share/man/man5/hosts.5
C src/share/man/man5/networks.5
C src/share/man/man5/passwd.5
C src/share/man/man5/phones.5
C src/share/man/man5/printcap.5
C src/share/man/man5/protocols.5
C src/share/man/man5/remote.5
C src/share/man/man5/resolver.5
C src/share/man/man5/services.5
C src/share/man/man5/shells.5
C src/share/man/man5/stab.5
C src/share/man/man5/types.5
C src/share/man/man5/utmp.5

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

	cvs checkout -jCSRG:yesterday -jCSRG src/share/man/man5