Date: Sun, 22 Mar 1998 02:01:09 +0800 From: Peter Wemm <peter@netplex.com.au> 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 Message-ID: <199803211801.CAA01534@spinner.netplex.com.au> In-Reply-To: Your message of "Sat, 21 Mar 1998 07:19:24 PST." <199803211519.HAA10707@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199803211801.CAA01534>