Module Name:	basesrc
Committed By:	veego
Date:		Sun May 21 18:53:56 UTC 2000

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

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/ip_sfil.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/ipnat.c

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