Module Name:	basesrc
Committed By:	veego
Date:		Tue Feb  1 20:31:13 UTC 2000

Modified Files:
	basesrc/dist/ipf: BNF HISTORY fils.c ip_lfil.c ip_sfil.c ipmon.c ipt.c
	    parse.c
	basesrc/dist/ipf/man: ipf.5 ipmon.8

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/BNF basesrc/dist/ipf/ip_lfil.c \
    basesrc/dist/ipf/ip_sfil.c basesrc/dist/ipf/ipt.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/HISTORY basesrc/dist/ipf/fils.c \
    basesrc/dist/ipf/ipmon.c basesrc/dist/ipf/parse.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/man/ipf.5 basesrc/dist/ipf/man/ipmon.8

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