From owner-cvs-all  Sun Feb 25 23:17: 6 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id D39E537B503; Sun, 25 Feb 2001 23:17:03 -0800 (PST)
	(envelope-from kris@FreeBSD.org)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1Q7H3917470;
	Sun, 25 Feb 2001 23:17:03 -0800 (PST)
	(envelope-from kris)
Message-Id: <200102260717.f1Q7H3917470@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sun, 25 Feb 2001 23:17:03 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/bc/bc main.c scan.l src/contrib/bc/doc
         bc.1 dc.1
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2001/02/25 23:17:03 PST

  Modified files:
    contrib/bc/bc        main.c scan.l 
    contrib/bc/doc       bc.1 dc.1 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.5       +57 -35    src/contrib/bc/bc/main.c
  1.5       +98 -16    src/contrib/bc/bc/scan.l
  1.5       +61 -55    src/contrib/bc/doc/bc.1
  1.4       +49 -8     src/contrib/bc/doc/dc.1


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message