christos
Fri Sep 26 15:52:12 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv8136

Modified Files:
	Makefile 
Log Message:
Resolve conflicts


christos
Fri Sep 26 15:52:20 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/chat
In directory netbsd1:/var/slash-tmp/cvs-serv8136/chat

Modified Files:
	Makefile chat.8 chat.c 
Log Message:
Resolve conflicts


christos
Fri Sep 26 15:53:28 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv8136/pppd

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


christos
Fri Sep 26 15:53:33 EDT 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppstats
In directory netbsd1:/var/slash-tmp/cvs-serv8136/pppstats

Modified Files:
	Makefile pppstats.c 
Log Message:
Resolve conflicts