From owner-cvs-all  Wed Aug  2  4:38:25 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5908D37B583; Wed,  2 Aug 2000 04:38:22 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Received: (from sheldonh@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id EAA85005;
	Wed, 2 Aug 2000 04:38:21 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Message-Id: <200008021138.EAA85005@freefall.freebsd.org>
From: Sheldon Hearn <sheldonh@FreeBSD.org>
Date: Wed, 2 Aug 2000 04:38:21 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sbin/routed main.c output.c parms.c rdisc.c
         routed.8 table.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

sheldonh    2000/08/02 04:38:21 PDT

  Modified files:
    sbin/routed          main.c output.c parms.c rdisc.c routed.8 
                         table.c 
  Log:
  Resolve conflicts from vendor merge.
  
  Revision  Changes    Path
  1.12      +5 -3      src/sbin/routed/main.c
  1.6       +4 -4      src/sbin/routed/output.c
  1.8       +2 -2      src/sbin/routed/parms.c
  1.6       +4 -4      src/sbin/routed/rdisc.c
  1.16      +3 -3      src/sbin/routed/routed.8
  1.13      +9 -9      src/sbin/routed/table.c



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