christos
Wed Mar 12 15:18:31 EST 1997
Update of /a/cvsroot/src/usr.sbin/pppd
In directory netbsd1:/var/slash-tmp/cvs-serv6321

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.cbcp.8 pppd.h sys-bsd.c 
	upap.c upap.h 
Removed Files:
	grammar.y md5.c md5.h scanner.l 
Log Message:
Resolve conflicts cleanup warnings.


christos
Wed Mar 12 15:18:38 EST 1997
Update of /a/cvsroot/src/usr.sbin/pppd/chat
In directory netbsd1:/var/slash-tmp/cvs-serv6321/chat

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


christos
Wed Mar 12 15:18:43 EST 1997
Update of /a/cvsroot/src/usr.sbin/pppd/pppstats
In directory netbsd1:/var/slash-tmp/cvs-serv6321/pppstats

Modified Files:
	Makefile pppstats.8 pppstats.c 
Log Message:
Resolve conflicts cleanup warnings.