From owner-cvs-usrsbin  Tue Oct 31 13:11:34 1995
Return-Path: owner-cvs-usrsbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id NAA23844
          for cvs-usrsbin-outgoing; Tue, 31 Oct 1995 13:11:34 -0800
Received: (from peter@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id NAA23828
          ; Tue, 31 Oct 1995 13:11:26 -0800
Date: Tue, 31 Oct 1995 13:11:26 -0800
From: Peter Wemm <peter>
Message-Id: <199510312111.NAA23828@freefall.freebsd.org>
To: CVS-commiters, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/pppd - Imported sources
Sender: owner-cvs-usrsbin@FreeBSD.org
Precedence: bulk

peter       95/10/31 13:11:24 (peter/633/peter)

  Branch:      usr.sbin/pppd  1.1.2
  Log:
  Import pppd onto the vendor branch from the ppp-2.2 package..
  
  Status:
  
  Vendor Tag:	MACKERAS
  Release Tags:	ppp_2_2
  
  C src/usr.sbin/pppd/auth.c
  N src/usr.sbin/pppd/ccp.c
  N src/usr.sbin/pppd/ccp.h
  C src/usr.sbin/pppd/chap.c
  C src/usr.sbin/pppd/chap.h
  C src/usr.sbin/pppd/fsm.c
  C src/usr.sbin/pppd/fsm.h
  C src/usr.sbin/pppd/ipcp.c
  C src/usr.sbin/pppd/ipcp.h
  C src/usr.sbin/pppd/lcp.c
  C src/usr.sbin/pppd/lcp.h
  C src/usr.sbin/pppd/magic.c
  C src/usr.sbin/pppd/magic.h
  C src/usr.sbin/pppd/main.c
  C src/usr.sbin/pppd/Makefile
  U src/usr.sbin/pppd/md5.c
  U src/usr.sbin/pppd/md5.h
  C src/usr.sbin/pppd/options.c
  C src/usr.sbin/pppd/pathnames.h
  C src/usr.sbin/pppd/patchlevel.h
  C src/usr.sbin/pppd/pppd.8
  C src/usr.sbin/pppd/pppd.h
  C src/usr.sbin/pppd/sys-bsd.c
  C src/usr.sbin/pppd/upap.c
  C src/usr.sbin/pppd/upap.h
  
  21 conflicts created by this import.
  Use the following command to help the merge:
  
  	ccvs checkout -jMACKERAS:yesterday -jMACKERAS src/usr.sbin/pppd