From owner-cvs-sys  Thu Apr  3 02:47:24 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id CAA13982
          for cvs-sys-outgoing; Thu, 3 Apr 1997 02:47:24 -0800 (PST)
Received: (from darrenr@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id CAA13966;
          Thu, 3 Apr 1997 02:47:20 -0800 (PST)
Date: Thu, 3 Apr 1997 02:47:20 -0800 (PST)
From: Darren Reed <darrenr>
Message-Id: <199704031047.CAA13966@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/netinet ip_input.c ip_output.c
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

darrenr     97/04/03 02:47:18

  Modified:    sys/netinet  ip_input.c ip_output.c
  Log:
  Resolve conflicts created by import.
  
  Revision  Changes    Path
  1.61      +13 -15    src/sys/netinet/ip_input.c
  1.54      +8 -3      src/sys/netinet/ip_output.c