From owner-cvs-sys Tue Jul 1 13:48:10 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id NAA20197 for cvs-sys-outgoing; Tue, 1 Jul 1997 13:48:10 -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 NAA20106; Tue, 1 Jul 1997 13:46:07 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.5/8.8.5) id NAA29846; Tue, 1 Jul 1997 13:44:10 -0700 (PDT) Date: Tue, 1 Jul 1997 13:44:10 -0700 (PDT) Message-Id: <199707012044.NAA29846@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/07/01 13:44:10 PDT src/sys/net - Imported sources Update of /home/ncvs/src/sys/net In directory freefall.freebsd.org:/tmp/cvs-serv29792 Log Message: Import files from the ppp-2.3.0 dist for working on. This does not change the present code, all existing files have left the vendor branch. There are three new files that will appear but they are not used and should not be a problem. Obtained from: Paul Mackerras, via ftp://cs.anu.edu.au/pub/software/ppp Status: Vendor Tag: MACKERRAS Release Tags: ppp_2_3_0 C src/sys/net/ppp_tty.c C src/sys/net/ppp_defs.h C src/sys/net/if_pppvar.h C src/sys/net/if_ppp.c C src/sys/net/if_ppp.h C src/sys/net/bsd_comp.c C src/sys/net/slcompress.h C src/sys/net/slcompress.c N src/sys/net/zlib.h N src/sys/net/zlib.c C src/sys/net/ppp_comp.h N src/sys/net/ppp_deflate.c 9 conflicts created by this import. Use the following command to help the merge: cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/sys/net