From owner-cvs-all  Thu Aug 10  0:54:37 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 B26AA37B980; Thu, 10 Aug 2000 00:54:34 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Received: (from sheldonh@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA56143;
	Thu, 10 Aug 2000 00:54:34 -0700 (PDT)
	(envelope-from sheldonh@FreeBSD.org)
Message-Id: <200008100754.AAA56143@freefall.freebsd.org>
From: Sheldon Hearn <sheldonh@FreeBSD.org>
Date: Thu, 10 Aug 2000 00:54:33 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/sbin/routed if.c main.c rdisc.c table.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

sheldonh    2000/08/10 00:54:33 PDT

  Modified files:
    sbin/routed          if.c main.c rdisc.c table.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +4 -1      src/sbin/routed/if.c
  1.13      +1 -1      src/sbin/routed/main.c
  1.7       +1 -1      src/sbin/routed/rdisc.c
  1.14      +4 -2      src/sbin/routed/table.c



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