CVS commit: src/external/bsd/libpcap/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Tue Dec 31 17:08:23 UTC 2013

Modified Files:
        src/external/bsd/libpcap/dist: gencode.c grammar.y optimize.c
            pcap-bpf.c pcap.3pcap.in pcap.c pcap_open_offline.3pcap.in
            scanner.l sf-pcap-ng.c sf-pcap.c
        src/external/bsd/libpcap/dist/pcap: bpf.h pcap.h

Log Message:
resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libpcap/dist/gencode.c \
    src/external/bsd/libpcap/dist/optimize.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/grammar.y \
    src/external/bsd/libpcap/dist/pcap-bpf.c \
    src/external/bsd/libpcap/dist/pcap.3pcap.in \
    src/external/bsd/libpcap/dist/pcap.c \
    src/external/bsd/libpcap/dist/pcap_open_offline.3pcap.in \
    src/external/bsd/libpcap/dist/sf-pcap-ng.c \
    src/external/bsd/libpcap/dist/sf-pcap.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/scanner.l
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libpcap/dist/pcap/bpf.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/pcap/pcap.h

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