christos
Sat May 17 17:33:10 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppstats
In directory netbsd1:/var/slash-tmp/cvs-serv15801

Modified Files:
	Makefile pppstats.8 pppstats.c 
Log Message:
resolve conflicts


christos
Sat May 17 17:38:54 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv17065

Log Message:
update to ppp 2.3b5

Status:

Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3B5
		
C src/usr.sbin/pppd/pppd/upap.h
C src/usr.sbin/pppd/pppd/pppd.h
C src/usr.sbin/pppd/pppd/pppd.cbcp.8
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/upap.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/Makefile
C src/usr.sbin/pppd/pppd/sys-bsd.c

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

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