From owner-cvs-usrsbin  Sat Mar 21 10:01:53 1998
Return-Path: <owner-cvs-usrsbin>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id KAA03434
          for cvs-usrsbin-outgoing; Sat, 21 Mar 1998 10:01:53 -0800 (PST)
          (envelope-from owner-cvs-usrsbin)
Received: from spinner.netplex.com.au (spinner.netplex.com.au [202.12.86.3])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id KAA03413;
          Sat, 21 Mar 1998 10:01:20 -0800 (PST)
          (envelope-from peter@netplex.com.au)
Received: from spinner.netplex.com.au (localhost [127.0.0.1])
	by spinner.netplex.com.au (8.8.8/8.8.8/Spinner) with ESMTP id CAA01534;
	Sun, 22 Mar 1998 02:01:13 +0800 (WST)
	(envelope-from peter@spinner.netplex.com.au)
Message-Id: <199803211801.CAA01534@spinner.netplex.com.au>
X-Mailer: exmh version 2.0.2 2/24/98
To: Peter Wemm <peter@FreeBSD.ORG>
cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-usrsbin@FreeBSD.ORG
Subject: Re: cvs commit: src/usr.sbin/pppd - Imported sources 
In-reply-to: Your message of "Sat, 21 Mar 1998 07:19:24 PST."
             <199803211519.HAA10707@freefall.freebsd.org> 
Date: Sun, 22 Mar 1998 02:01:09 +0800
From: Peter Wemm <peter@netplex.com.au>
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

Peter Wemm wrote:
>   Log Message:
>   Import ppp-2.3.3 onto vendor branch.
>   
>   C src/usr.sbin/pppd/options.c
>   C src/usr.sbin/pppd/ipcp.h
[..]
>   C src/usr.sbin/pppd/upap.h
>   
>   29 conflicts created by this import.

Argh!!  The vendor branch is on 1.1.2 on these files! :-(  cvsup is going 
to hate me for this, but this is going to be undone....

-Peter