[Midnightbsd-cvs] src: contrib/ipfilter: Resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts

Modified Files:
--------------
    src/contrib/ipfilter:
        ip_fil.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ip_fil.c?r1=1.3&r2=1.4)
        ipf.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipf.h?r1=1.2&r2=1.3)
        mlf_ipl.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/mlf_ipl.c?r1=1.2&r2=1.3)
        mlf_rule.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/mlf_rule.c?r1=1.2&r2=1.3)
        pcap-bpf.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/pcap-bpf.h?r1=1.2&r2=1.3)
    src/contrib/ipfilter/iplang:
        iplang_y.y (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/iplang/iplang_y.y?r1=1.2&r2=1.3)
    src/contrib/ipfilter/ipsend:
        44arp.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/44arp.c?r1=1.2&r2=1.3)
        ip.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/ip.c?r1=1.2&r2=1.3)
        iptests.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/iptests.c?r1=1.2&r2=1.3)
        resend.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/resend.c?r1=1.2&r2=1.3)
        sbpf.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/sbpf.c?r1=1.2&r2=1.3)
        sock.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/ipsend/sock.c?r1=1.2&r2=1.3)
    src/contrib/ipfilter/lib:
        getifname.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/getifname.c?r1=1.2&r2=1.3)
        kmem.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/kmem.c?r1=1.2&r2=1.3)
        printaps.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/printaps.c?r1=1.2&r2=1.3)
    src/contrib/ipfilter/tools:
        ipf.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipf.c?r1=1.3&r2=1.4)
        ipfcomp.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipfcomp.c?r1=1.3&r2=1.4)
        ipfs.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipfs.c?r1=1.2&r2=1.3)
        ipfstat.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipfstat.c?r1=1.2&r2=1.3)
        ipftest.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipftest.c?r1=1.2&r2=1.3)
        ipmon.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipmon.c?r1=1.2&r2=1.3)
        ipnat.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipnat.c?r1=1.2&r2=1.3)
        ipnat_y.y (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ipnat_y.y?r1=1.3&r2=1.4)
        ippool.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ippool.c?r1=1.2&r2=1.3)
        ippool_y.y (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/tools/ippool_y.y?r1=1.2&r2=1.3)

Added Files:
-----------
    src/contrib/ipfilter/lib:
        addkeep.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/addkeep.c?rev=1.3&content-type=text/x-cvsweb-markup)
        extras.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/extras.c?rev=1.3&content-type=text/x-cvsweb-markup)
        genmask.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/genmask.c?rev=1.3&content-type=text/x-cvsweb-markup)
        getline.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/getline.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hexdump.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/hexdump.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hostmask.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/hostmask.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hostnum.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/hostnum.c?rev=1.3&content-type=text/x-cvsweb-markup)
        loglevel.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/loglevel.c?rev=1.3&content-type=text/x-cvsweb-markup)
        make_range.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/make_range.c?rev=1.3&content-type=text/x-cvsweb-markup)
        natparse.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/natparse.c?rev=1.3&content-type=text/x-cvsweb-markup)
        parse.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/parse.c?rev=1.3&content-type=text/x-cvsweb-markup)
        portnum.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/portnum.c?rev=1.3&content-type=text/x-cvsweb-markup)
        ports.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/ports.c?rev=1.3&content-type=text/x-cvsweb-markup)
        ratoi.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/ratoi.c?rev=1.3&content-type=text/x-cvsweb-markup)
        ratoui.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/ratoui.c?rev=1.3&content-type=text/x-cvsweb-markup)
        to_interface.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/ipfilter/lib/to_interface.c?rev=1.3&content-type=text/x-cvsweb-markup)