source-changes: NetBSD master CVS tree commits

Subject: NetBSD master CVS tree commits
To: None <source-changes@NetBSD.ORG>
From: The Source of All Evil <source@NetBSD.ORG>
List: source-changes
Date: 05/02/1998 07:40:02

christos
Sat May  2 10:31:10 EDT 1998
Update of /cvsroot/src/usr.sbin/pppd/pppstats
In directory nb00:/tmp/cvs-serv22824

Modified Files:
	pppstats.c 
Log Message:
Resolve conflicts


christos
Sat May  2 10:34:25 EDT 1998
Update of /cvsroot/src/sys/net
In directory nb00:/tmp/cvs-serv22847

Modified Files:
	if_ppp.c ppp-comp.h ppp-deflate.c zlib.c zlib.h 
Log Message:
Merge changes from pppd-2.3.4; adds ppp-deflate-draft stuff and updates
zlib. Maybe we can merge our other copy of zlib with this one now and
avoid having two copies?


christos
Sat May  2 10:35:05 EDT 1998
Update of /cvsroot/src/usr.sbin/pppd/chat
In directory nb00:/tmp/cvs-serv22887

Log Message:
pppd 2.3.4 from Paulus

Status:

Vendor Tag:	MACKERRAS
Release Tags:	PPP2_3_4
		
C src/usr.sbin/pppd/chat/chat.c
C src/usr.sbin/pppd/chat/chat.8

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

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