christos
Sat May  2 09:36:09 EDT 1998
Update of /cvsroot/src/usr.sbin/pppd/pppd
In directory nb00:/tmp/cvs-serv22095

Log Message:
pppd-2.3.4 from Paulus

Status:

Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3_4
		
C src/usr.sbin/pppd/pppd/upap.c
C src/usr.sbin/pppd/pppd/sys-bsd.c
C src/usr.sbin/pppd/pppd/pppd.h
C src/usr.sbin/pppd/pppd/pppd.8
C src/usr.sbin/pppd/pppd/pathnames.h
C src/usr.sbin/pppd/pppd/patchlevel.h
C src/usr.sbin/pppd/pppd/options.c
C src/usr.sbin/pppd/pppd/main.c
C src/usr.sbin/pppd/pppd/magic.h
C src/usr.sbin/pppd/pppd/magic.c
C src/usr.sbin/pppd/pppd/lcp.h
C src/usr.sbin/pppd/pppd/lcp.c
C src/usr.sbin/pppd/pppd/ipxcp.h
C src/usr.sbin/pppd/pppd/ipxcp.c
C src/usr.sbin/pppd/pppd/ipcp.h
C src/usr.sbin/pppd/pppd/ipcp.c
C src/usr.sbin/pppd/pppd/fsm.h
C src/usr.sbin/pppd/pppd/fsm.c
C src/usr.sbin/pppd/pppd/demand.c
C src/usr.sbin/pppd/pppd/chap_ms.h
C src/usr.sbin/pppd/pppd/chap_ms.c
C src/usr.sbin/pppd/pppd/chap.h
C src/usr.sbin/pppd/pppd/chap.c
C src/usr.sbin/pppd/pppd/ccp.h
C src/usr.sbin/pppd/pppd/ccp.c
C src/usr.sbin/pppd/pppd/cbcp.h
C src/usr.sbin/pppd/pppd/cbcp.c
C src/usr.sbin/pppd/pppd/auth.c
C src/usr.sbin/pppd/pppd/upap.h

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

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