Module Name:	basesrc
Committed By:	christos
Date:		Tue Aug 24 20:25:47 UTC 1999

Update of /cvsroot/basesrc/usr.sbin/pppd/pppd
In directory nb00:/tmp/cvs-serv25100

Log Message:
New pppd, post 2.3.9 directly from the repository.


Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3_9_19990824
		
U basesrc/usr.sbin/pppd/pppd/upap.h
C basesrc/usr.sbin/pppd/pppd/upap.c
C basesrc/usr.sbin/pppd/pppd/sys-bsd.c
C basesrc/usr.sbin/pppd/pppd/pppd.h
C basesrc/usr.sbin/pppd/pppd/pppd.8
C basesrc/usr.sbin/pppd/pppd/pathnames.h
C basesrc/usr.sbin/pppd/pppd/patchlevel.h
C basesrc/usr.sbin/pppd/pppd/options.c
C basesrc/usr.sbin/pppd/pppd/main.c
U basesrc/usr.sbin/pppd/pppd/magic.h
C basesrc/usr.sbin/pppd/pppd/magic.c
C basesrc/usr.sbin/pppd/pppd/lcp.h
C basesrc/usr.sbin/pppd/pppd/lcp.c
C basesrc/usr.sbin/pppd/pppd/ipxcp.h
C basesrc/usr.sbin/pppd/pppd/ipxcp.c
N basesrc/usr.sbin/pppd/pppd/ipv6cp.h
N basesrc/usr.sbin/pppd/pppd/ipv6cp.c
C basesrc/usr.sbin/pppd/pppd/ipcp.h
C basesrc/usr.sbin/pppd/pppd/ipcp.c
U basesrc/usr.sbin/pppd/pppd/fsm.h
C basesrc/usr.sbin/pppd/pppd/fsm.c
N basesrc/usr.sbin/pppd/pppd/eui64.h
N basesrc/usr.sbin/pppd/pppd/eui64.c
C basesrc/usr.sbin/pppd/pppd/demand.c
U basesrc/usr.sbin/pppd/pppd/chap_ms.h
C basesrc/usr.sbin/pppd/pppd/chap_ms.c
U basesrc/usr.sbin/pppd/pppd/chap.h
C basesrc/usr.sbin/pppd/pppd/chap.c
C basesrc/usr.sbin/pppd/pppd/ccp.h
C basesrc/usr.sbin/pppd/pppd/ccp.c
U basesrc/usr.sbin/pppd/pppd/cbcp.h
C basesrc/usr.sbin/pppd/pppd/cbcp.c
C basesrc/usr.sbin/pppd/pppd/auth.c
N basesrc/usr.sbin/pppd/pppd/utils.c

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

	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS basesrc/usr.sbin/pppd/pppd