tls
Tue Apr 29 12:36:20 PDT 1997
Update of /a/cvsroot/src/libexec/fingerd
In directory netbsd1:/var/slash-tmp/cvs-serv3751

Log Message:
Import from 4.4BSD-Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/libexec/fingerd/fingerd.8
C src/libexec/fingerd/fingerd.c
C src/libexec/fingerd/Makefile
C src/libexec/fingerd/pathnames.h

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

	cvs checkout -jCSRG:yesterday -jCSRG src/libexec/fingerd


tls
Tue Apr 29 12:37:41 PDT 1997
Update of /a/cvsroot/src/libexec/getNAME
In directory netbsd1:/var/slash-tmp/cvs-serv3815

Log Message:
Import from 4.4BSD-Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/libexec/getNAME/Makefile
C src/libexec/getNAME/getNAME.c

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

	cvs checkout -jCSRG:yesterday -jCSRG src/libexec/getNAME


tls
Tue Apr 29 12:39:16 PDT 1997
Update of /a/cvsroot/src/libexec/makekey
In directory netbsd1:/var/slash-tmp/cvs-serv3855

Log Message:
Import from 4.4BSD-Lite

Status:

Vendor Tag:	CSRG
Release Tags:	lite-1
		
C src/libexec/makekey/Makefile
C src/libexec/makekey/makekey.c
C src/libexec/makekey/makekey.8

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

	cvs checkout -jCSRG:yesterday -jCSRG src/libexec/makekey