Subject: CVS commit: src/sys/dist/pf/net
To: None <>
From: YAMAMOTO Takashi <>
List: source-changes
Date: 11/14/2004 11:12:16
Module Name:	src
Committed By:	yamt
Date:		Sun Nov 14 11:12:16 UTC 2004

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

Log Message:
resolve conflicts.  (pf from OpenBSD 3.6, kernel part)

To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/sys/dist/pf/net/if_pflog.c src/sys/dist/pf/net/pf.c \
cvs rdiff -r1.2 -r1.3 src/sys/dist/pf/net/if_pflog.h
cvs rdiff -r1.5 -r1.6 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.11 -r1.12 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -r1.3 -r1.4 src/sys/dist/pf/net/pf_osfp.c

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