Module Name:	basesrc
Committed By:	veego
Date:		Mon Jun 12 10:43:25 UTC 2000

Modified Files:
	basesrc/dist/ipf: HISTORY natparse.c
	basesrc/dist/ipf/man: ipfstat.8
	basesrc/dist/ipf/test: Makefile

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/natparse.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/man/ipfstat.8
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/test/Makefile

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