NetBSD master CVS tree commits

[The Source of All Evil <source%NetBSD.ORG@localhost>]

christos
Sat May  2 10:19:16 EDT 1998
Update of /cvsroot/src/usr.sbin/pppd/pppd
In directory nb00:/tmp/cvs-serv22522

Modified Files:
        Makefile auth.c ccp.c ccp.h chap.c chap_ms.c chap_ms.h 
        demand.c ipcp.c ipxcp.c lcp.c magic.c main.c options.c 
        patchlevel.h pppd.8 pppd.h sys-bsd.c 
Removed Files:
        pppd.cbcp.8 
Log Message:
Resolve conflicts.