Module Name:	basesrc
Committed By:	veego
Date:		Wed Aug  9 21:03:06 UTC 2000

Modified Files:
	basesrc/dist/ipf: HISTORY Makefile fils.c ip_sfil.c ipf.c ipmon.c
	    ipnat.c natparse.c parse.c
	basesrc/dist/ipf/iplang: iplang_y.y
	basesrc/dist/ipf/ipsend: ipsend.1 ipsend.5
Removed Files:
	basesrc/dist/ipf/SunOS5: prototype32

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/Makefile
cvs rdiff -r1.9 -r1.10 basesrc/dist/ipf/fils.c
cvs rdiff -r1.5 -r1.6 basesrc/dist/ipf/ip_sfil.c basesrc/dist/ipf/ipnat.c
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/ipf.c basesrc/dist/ipf/ipmon.c \
    basesrc/dist/ipf/parse.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/natparse.c
cvs rdiff -r1.1.1.1 -r0 basesrc/dist/ipf/SunOS5/prototype32
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/iplang/iplang_y.y
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/ipsend/ipsend.1
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/ipsend/ipsend.5

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