Module Name:	basesrc
Committed By:	veego
Date:		Tue May 23 06:16:45 UTC 2000

Modified Files:
	basesrc/dist/ipf: HISTORY fils.c ip_sfil.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.8 -r1.9 basesrc/dist/ipf/fils.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/ip_sfil.c

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