From owner-cvs-usrsbin  Fri Aug 22 04:22:04 1997
Return-Path: <owner-cvs-usrsbin>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id EAA02917
          for cvs-usrsbin-outgoing; Fri, 22 Aug 1997 04:22:04 -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 EAA02875;
          Fri, 22 Aug 1997 04:21:24 -0700 (PDT)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id EAA13331;
	Fri, 22 Aug 1997 04:21:10 -0700 (PDT)
Date: Fri, 22 Aug 1997 04:21:10 -0700 (PDT)
Message-Id: <199708221121.EAA13331@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/22 04:21:09 PDT

  src/usr.sbin/pppd - Imported sources
  Update of /home/ncvs/src/usr.sbin/pppd
  In directory freefall.freebsd.org:/tmp/cvs-serv13153
  
  Log Message:
  Import pppd from ppp-2.3.1 package onto vendor branch for reference.
  
  Obtained from: Paul Mackerras <paulus@cs.anu.edu.au>
  	       at ftp://cs.anu.edu.au/pub/software/ppp/
  
  Status:
  
  Vendor Tag:	MACKERRAS
  Release Tags:	ppp_2_3_1
  		
  U src/usr.sbin/pppd/upap.c
  U src/usr.sbin/pppd/Makefile
  U src/usr.sbin/pppd/sys-bsd.c
  U src/usr.sbin/pppd/pppd.h
  U src/usr.sbin/pppd/pppd.8
  U 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
  U src/usr.sbin/pppd/magic.c
  U src/usr.sbin/pppd/lcp.h
  U src/usr.sbin/pppd/lcp.c
  U src/usr.sbin/pppd/ipxcp.h
  U src/usr.sbin/pppd/ipxcp.c
  U src/usr.sbin/pppd/ipcp.h
  C src/usr.sbin/pppd/ipcp.c
  U src/usr.sbin/pppd/fsm.h
  U src/usr.sbin/pppd/fsm.c
  U src/usr.sbin/pppd/demand.c
  U src/usr.sbin/pppd/chap_ms.h
  U src/usr.sbin/pppd/chap_ms.c
  U src/usr.sbin/pppd/chap.h
  U src/usr.sbin/pppd/chap.c
  U src/usr.sbin/pppd/ccp.h
  U src/usr.sbin/pppd/ccp.c
  U src/usr.sbin/pppd/cbcp.h
  U src/usr.sbin/pppd/cbcp.c
  C src/usr.sbin/pppd/auth.c
  U src/usr.sbin/pppd/upap.h
  
  5 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd