Module Name:	basesrc
Committed By:	mike
Date:		Mon Mar 26 06:11:49 UTC 2001

Modified Files:
	basesrc/dist/ipf: BNF HISTORY Makefile fils.c ip_sfil.c ipf.c ipfs.c
	    ipft_tx.c ipmon.c ipnat.c parse.c
	basesrc/dist/ipf/iplang: Makefile
	basesrc/dist/ipf/ipsend: 44arp.c ip.c ipsend.c resend.c sock.c
	basesrc/dist/ipf/man: ipf.4 ipf.5 ipfstat.8 ipmon.8 ipnat.4
	basesrc/dist/ipf/perl: plog
	basesrc/dist/ipf/rules: BASIC.NAT
	basesrc/dist/ipf/samples: userauth.c
	basesrc/dist/ipf/test/expected: i7

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/BNF basesrc/dist/ipf/ipft_tx.c
cvs rdiff -r1.9 -r1.10 basesrc/dist/ipf/HISTORY
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/Makefile basesrc/dist/ipf/ipfs.c
cvs rdiff -r1.11 -r1.12 basesrc/dist/ipf/fils.c
cvs rdiff -r1.6 -r1.7 basesrc/dist/ipf/ip_sfil.c basesrc/dist/ipf/ipnat.c
cvs rdiff -r1.5 -r1.6 basesrc/dist/ipf/ipf.c basesrc/dist/ipf/ipmon.c \
    basesrc/dist/ipf/parse.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/iplang/Makefile
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/ipsend/44arp.c \
    basesrc/dist/ipf/ipsend/ip.c basesrc/dist/ipf/ipsend/resend.c \
    basesrc/dist/ipf/ipsend/sock.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/ipsend/ipsend.c
cvs rdiff -r1.3 -r1.4 basesrc/dist/ipf/man/ipf.4 basesrc/dist/ipf/man/ipf.5
cvs rdiff -r1.4 -r1.5 basesrc/dist/ipf/man/ipfstat.8
cvs rdiff -r1.6 -r1.7 basesrc/dist/ipf/man/ipmon.8
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/man/ipnat.4
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/perl/plog
cvs rdiff -r1.1 -r1.2 basesrc/dist/ipf/rules/BASIC.NAT
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/samples/userauth.c
cvs rdiff -r1.2 -r1.3 basesrc/dist/ipf/test/expected/i7

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