From owner-cvs-sbin  Fri Jan  3 00:29:49 1997
Return-Path: <owner-cvs-sbin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id AAA07299
          for cvs-sbin-outgoing; Fri, 3 Jan 1997 00:29:49 -0800 (PST)
Received: (from ache@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id AAA07292;
          Fri, 3 Jan 1997 00:29:48 -0800 (PST)
Date: Fri, 3 Jan 1997 00:29:48 -0800 (PST)
From: "Andrey A. Chernov" <ache>
Message-Id: <199701030829.AAA07292@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sbin
Subject: cvs commit:  src/sbin/routed input.c
Sender: owner-cvs-sbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

ache        97/01/03 00:29:47

  Modified:    sbin/routed  input.c
  Log:
  Merge to eliminate conflict
  
  Revision  Changes    Path
  1.3       +1 -1      src/sbin/routed/input.c