From owner-cvs-sys  Thu Apr  3 02:39:39 1997
Return-Path: <owner-cvs-sys>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id CAA13424
          for cvs-sys-outgoing; Thu, 3 Apr 1997 02:39:39 -0800 (PST)
Received: (from darrenr@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id CAA13416;
          Thu, 3 Apr 1997 02:39:37 -0800 (PST)
Date: Thu, 3 Apr 1997 02:39:37 -0800 (PST)
From: Darren Reed <darrenr>
Message-Id: <199704031039.CAA13416@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/netinet - Imported sources
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

darrenr     97/04/03 02:39:36

  src/sys/netinet - Imported sources
  Update of /home/ncvs/src/sys/netinet
  In directory freefall.freebsd.org:/a/darrenr/netinet
  
  Revision/Branch: 1.1.1
  
  Log Message:
  Really import sys/netinet changes for IP Filter 3.2alpha4 this time.
  
  Status:
  
  Vendor Tag:	DARRENR
  Release Tags:	V3_2_A4
  		
  U src/sys/netinet/fil.c
  U src/sys/netinet/ip_compat.h
  U src/sys/netinet/ip_fil.c
  U src/sys/netinet/ip_fil.h
  U src/sys/netinet/ip_frag.c
  U src/sys/netinet/ip_frag.h
  C src/sys/netinet/ip_input.c
  U src/sys/netinet/ip_nat.c
  U src/sys/netinet/ip_nat.h
  C src/sys/netinet/ip_output.c
  U src/sys/netinet/ip_state.c
  U src/sys/netinet/ip_state.h
  
  2 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jDARRENR:yesterday -jDARRENR src/sys/netinet