From owner-cvs-sys  Sat Mar 21 12:03:57 1998
Return-Path: <owner-cvs-sys>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA16920
          for cvs-sys-outgoing; Sat, 21 Mar 1998 12:03:57 -0800 (PST)
          (envelope-from owner-cvs-sys)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA16868;
          Sat, 21 Mar 1998 12:03:51 -0800 (PST)
          (envelope-from peter@FreeBSD.org)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id MAA04847;
	Sat, 21 Mar 1998 12:03:38 -0800 (PST)
Date: Sat, 21 Mar 1998 12:03:38 -0800 (PST)
Message-Id: <199803212003.MAA04847@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG
Subject: cvs commit: src/sys/net - Imported sources
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1998/03/21 12:03:38 PST

  src/sys/net - Imported sources
  Update of /home/ncvs/src/sys/net
  In directory freefall.freebsd.org:/tmp/cvs-serv4804
  
  Log Message:
  Import kernel parts of ppp-2.3.3 onto vendor branch.  The main change is
  that the zlib code has been updated from v0.95 to v1.0.4.
  
  Status:
  
  Vendor Tag:	MACKERRAS
  Release Tags:	ppp_2_3_3
  		
  C src/sys/net/zlib.h
  C src/sys/net/zlib.c
  U src/sys/net/slcompress.h
  U src/sys/net/slcompress.c
  U src/sys/net/ppp_tty.c
  U src/sys/net/if_pppvar.h
  U src/sys/net/if_ppp.c
  U src/sys/net/ppp_comp.h
  U src/sys/net/ppp_defs.h
  U src/sys/net/bsd_comp.c
  U src/sys/net/if_ppp.h
  C src/sys/net/ppp_deflate.c
  
  3 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/sys/net