From owner-cvs-sys Fri Aug 22 04:54:09 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id EAA04140 for cvs-sys-outgoing; Fri, 22 Aug 1997 04:54:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id EAA04086; Fri, 22 Aug 1997 04:53:35 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id EAA13929; Fri, 22 Aug 1997 04:53:21 -0700 (PDT) Date: Fri, 22 Aug 1997 04:53:21 -0700 (PDT) Message-Id: <199708221153.EAA13929@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 1997/08/22 04:53:20 PDT src/sys/net - Imported sources Update of /home/ncvs/src/sys/net In directory freefall.freebsd.org:/tmp/cvs-serv13890 Log Message: Import kernel parts of ppp-2.3.1 onto vendor branch. There are no changes, except for whitespace and a minor interface change in slcompress.* that we can do without for the time being. This is here just for reference. Status: Vendor Tag: MACKERRAS Release Tags: ppp_2_3_1 U src/sys/net/if_ppp.c U src/sys/net/zlib.h U src/sys/net/zlib.c U src/sys/net/if_ppp.h U src/sys/net/ppp_comp.h U src/sys/net/ppp_defs.h C src/sys/net/slcompress.h U src/sys/net/if_pppvar.h U src/sys/net/ppp_tty.c U src/sys/net/ppp_deflate.c C src/sys/net/slcompress.c U src/sys/net/bsd_comp.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/sys/net