From owner-cvs-usrsbin  Sat Mar 21 10:02:31 1998
Return-Path: <owner-cvs-usrsbin>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id KAA03665
          for cvs-usrsbin-outgoing; Sat, 21 Mar 1998 10:02:31 -0800 (PST)
          (envelope-from owner-cvs-usrsbin)
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 KAA03556;
          Sat, 21 Mar 1998 10:02:13 -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 KAA04433;
	Sat, 21 Mar 1998 10:02:00 -0800 (PST)
Date: Sat, 21 Mar 1998 10:02:00 -0800 (PST)
Message-Id: <199803211802.KAA04433@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       1998/03/21 10:02:00 PST

  src/usr.sbin/pppd - Imported sources
  Update of /home/ncvs/src/usr.sbin/pppd
  In directory freefall.freebsd.org:/tmp/cvs-serv4174
  
  Log Message:
  Import pppd from ppp-2.3.3 onto the vendor branch (on 1.1.2 hopefully)
  
  Status:
  
  Vendor Tag:	MACKERRAS
  Release Tags:	ppp_2_3_3
  		
  C src/usr.sbin/pppd/options.c
  U src/usr.sbin/pppd/ipcp.h
  C src/usr.sbin/pppd/auth.c
  U src/usr.sbin/pppd/cbcp.c
  U src/usr.sbin/pppd/cbcp.h
  U src/usr.sbin/pppd/ccp.c
  U src/usr.sbin/pppd/ccp.h
  C src/usr.sbin/pppd/chap.c
  U src/usr.sbin/pppd/chap.h
  C src/usr.sbin/pppd/chap_ms.c
  C src/usr.sbin/pppd/chap_ms.h
  C src/usr.sbin/pppd/demand.c
  U src/usr.sbin/pppd/fsm.c
  U src/usr.sbin/pppd/fsm.h
  U src/usr.sbin/pppd/ipcp.c
  U src/usr.sbin/pppd/ipxcp.c
  U src/usr.sbin/pppd/ipxcp.h
  C src/usr.sbin/pppd/lcp.c
  U src/usr.sbin/pppd/lcp.h
  U src/usr.sbin/pppd/magic.c
  U src/usr.sbin/pppd/magic.h
  C src/usr.sbin/pppd/main.c
  C src/usr.sbin/pppd/patchlevel.h
  U src/usr.sbin/pppd/pathnames.h
  U src/usr.sbin/pppd/pppd.8
  U src/usr.sbin/pppd/pppd.h
  C src/usr.sbin/pppd/sys-bsd.c
  U src/usr.sbin/pppd/upap.c
  U src/usr.sbin/pppd/upap.h
  
  10 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jMACKERRAS:yesterday -jMACKERRAS src/usr.sbin/pppd