NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

tls
Thu Jan  9 03:50:25 PST 1997
Update of /a/cvsroot/src/usr.bin/w
In directory netbsd1:/var/slash-tmp/cvs-serv19410

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
U src/usr.bin/w/w.1
C src/usr.bin/w/w.c
U src/usr.bin/w/uptime.1
U src/usr.bin/w/Makefile
U src/usr.bin/w/proc_compare.c
U src/usr.bin/w/pr_time.c
U src/usr.bin/w/extern.h

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

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


tls
Thu Jan  9 03:55:20 PST 1997
Update of /a/cvsroot/src/usr.bin/w
In directory netbsd1:/var/slash-tmp/cvs-serv19676

Modified Files:
        w.c 
Log Message:
Sync to 4.4BSD-Lite2

tls
Thu Jan  9 03:58:26 PST 1997
Update of /a/cvsroot/src/usr.bin/whatis
In directory netbsd1:/var/slash-tmp/cvs-serv20059

Log Message:
Import from 4.4BSD-Lite2

Status:

Vendor Tag:     CSRG
Release Tags:   lite-2
                
C src/usr.bin/whatis/whatis.c
C src/usr.bin/whatis/whatis.1
C src/usr.bin/whatis/Makefile

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

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