NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

christos
Sat May 17 17:12:20 EDT 1997
Update of /a/cvsroot/src/sys/net
In directory netbsd1:/var/slash-tmp/cvs-serv13377

Modified Files:
        if_ppp.c if_ppp.h if_pppvar.h if_sl.c ppp-deflate.c ppp_defs.h 
        slcompress.c slcompress.h zlib.c zlib.h 
Log Message:
Update to ppp-2.3b5


mjacob
Sat May 17 14:15:37 PDT 1997
Update of /cvsroot/src/usr.bin/file
In directory netbsd1:/var/slash-tmp/cvs-serv13594

Modified Files:
        Makefile 
Log Message:
Macro expansion of shell metacharacters did not occur for me. I made
a :sh variable to get the list of magic files instead.


christos
Sat May 17 17:18:13 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/chat
In directory netbsd1:/var/slash-tmp/cvs-serv13724

Log Message:
update to 2.3b5

Status:

Vendor Tag:     MACKERRAS
Release Tags:   PPP2_3B5
                
C src/usr.sbin/pppd/chat/Makefile
C src/usr.sbin/pppd/chat/chat.8
C src/usr.sbin/pppd/chat/chat.c

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

        cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd/chat