NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

tls
Tue Apr 29 12:40:07 PDT 1997
Update of /a/cvsroot/src/libexec/rexecd
In directory netbsd1:/var/slash-tmp/cvs-serv3914

Log Message:
Import from 4.4BSD-Lite

Status:

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

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

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


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

Log Message:
Import from 4.4BSD-Lite

Status:

Vendor Tag:     CSRG
Release Tags:   lite-1
                
C src/libexec/talkd/talkd.8
C src/libexec/talkd/Makefile
C src/libexec/talkd/announce.c
C src/libexec/talkd/print.c
C src/libexec/talkd/process.c
C src/libexec/talkd/table.c
C src/libexec/talkd/talkd.c

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

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


tls
Tue Apr 29 12:43:09 PDT 1997
Update of /a/cvsroot/src/libexec/tftpd
In directory netbsd1:/var/slash-tmp/cvs-serv4426

Log Message:
Import from 4.4BSD-Lite

Status:

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

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

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


tls
Tue Apr 29 12:44:08 PDT 1997
Update of /a/cvsroot/src/libexec/uucpd
In directory netbsd1:/var/slash-tmp/cvs-serv4480

Log Message:
Import from 4.4BSD-Lite

Status:

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

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

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


tls
Tue Apr 29 12:48:06 PDT 1997
Update of /a/cvsroot/src/libexec/comsat
In directory netbsd1:/home/OS/4.4BSD-Lite2/usr/src/libexec/comsat

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/libexec/comsat/comsat.c
I src/libexec/comsat/obj
U src/libexec/comsat/Makefile
U src/libexec/comsat/comsat.8
I src/libexec/comsat/tags

No conflicts created by this import


tls
Tue Apr 29 12:49:30 PDT 1997
Update of /a/cvsroot/src/libexec/fingerd
In directory netbsd1:/home/OS/4.4BSD-Lite2/usr/src/libexec/fingerd

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
I src/libexec/fingerd/obj
U src/libexec/fingerd/fingerd.8
U src/libexec/fingerd/fingerd.c
U src/libexec/fingerd/Makefile
U src/libexec/fingerd/pathnames.h
I src/libexec/fingerd/tags

No conflicts created by this import