Module Name:	basesrc
Committed By:	veego
Date:		Thu May 11 19:54:36 UTC 2000

Modified Files:
	basesrc/dist/ipf: HISTORY fils.c ipf.h ipfs.c ipnat.c
	basesrc/dist/ipf/man: ipmon.8

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.7 -r1.8 basesrc/dist/ipf/fils.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/ipf.h basesrc/dist/ipf/ipfs.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/ipnat.c
cvs rdiff -r1.5 -r1.6 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.