source-changes: CVS commit: src/sys/dist/pf/net

Subject: CVS commit: src/sys/dist/pf/net
To: None <source-changes@NetBSD.org>
From: Peter Postma <peter@netbsd.org>
List: source-changes
Date: 07/01/2005 12:37:35

Module Name:	src
Committed By:	peter
Date:		Fri Jul  1 12:37:35 UTC 2005

Modified Files:
	src/sys/dist/pf/net: pf.c pf_if.c pf_ioctl.c pf_norm.c pf_table.c
	    pfvar.h

Log Message:
Resolve conflicts (pf from OpenBSD 3.7, kernel part).


To generate a diff of this commit:
cvs rdiff -r1.16 -r1.17 src/sys/dist/pf/net/pf.c \
    src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -r1.8 -r1.9 src/sys/dist/pf/net/pf_if.c \
    src/sys/dist/pf/net/pf_norm.c src/sys/dist/pf/net/pfvar.h
cvs rdiff -r1.5 -r1.6 src/sys/dist/pf/net/pf_table.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.