From owner-cvs-usrsbin  Tue Aug 19 07:30:48 1997
Return-Path: <owner-cvs-usrsbin>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id HAA09392
          for cvs-usrsbin-outgoing; Tue, 19 Aug 1997 07:30:48 -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 HAA09341;
          Tue, 19 Aug 1997 07:30:28 -0700 (PDT)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id HAA08315;
	Tue, 19 Aug 1997 07:29:40 -0700 (PDT)
Date: Tue, 19 Aug 1997 07:29:40 -0700 (PDT)
Message-Id: <199708191429.HAA08315@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-usrsbin@FreeBSD.ORG
Subject: cvs commit: src/usr.sbin/pppd - Imported sources
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1997/08/19 07:29:40 PDT

  src/usr.sbin/pppd - Imported sources
  Update of /home/ncvs/src/usr.sbin/pppd
  In directory freefall.freebsd.org:/tmp/cvs-serv8182
  
  Log Message:
  Import pppd-2.3.0 - this should not make much difference until it's merged
  onto the mainline, although some new files will appear.
  
  Status:
  
  Vendor Tag:	MACKERRAS
  Release Tags:	ppp_2_3_0
  		
  C src/usr.sbin/pppd/Makefile
  C src/usr.sbin/pppd/upap.c
  C src/usr.sbin/pppd/sys-bsd.c
  C src/usr.sbin/pppd/pppd.h
  C src/usr.sbin/pppd/pppd.8
  C src/usr.sbin/pppd/pathnames.h
  C src/usr.sbin/pppd/patchlevel.h
  C src/usr.sbin/pppd/options.c
  C src/usr.sbin/pppd/main.c
  U src/usr.sbin/pppd/magic.h
  C src/usr.sbin/pppd/magic.c
  C src/usr.sbin/pppd/lcp.h
  C src/usr.sbin/pppd/lcp.c
  N src/usr.sbin/pppd/ipxcp.h
  N src/usr.sbin/pppd/ipxcp.c
  C src/usr.sbin/pppd/ipcp.h
  C src/usr.sbin/pppd/ipcp.c
  C src/usr.sbin/pppd/fsm.h
  C src/usr.sbin/pppd/fsm.c
  N src/usr.sbin/pppd/demand.c
  N src/usr.sbin/pppd/chap_ms.h
  N src/usr.sbin/pppd/chap_ms.c
  C src/usr.sbin/pppd/chap.h
  C src/usr.sbin/pppd/chap.c
  C src/usr.sbin/pppd/ccp.h
  C src/usr.sbin/pppd/ccp.c
  N src/usr.sbin/pppd/cbcp.h
  N src/usr.sbin/pppd/cbcp.c
  C src/usr.sbin/pppd/auth.c
  C src/usr.sbin/pppd/upap.h
  
  22 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd