Module Name:	src
Committed By:	dyoung
Date:		Mon Sep 27 23:02:53 UTC 2004

Modified Files:
	src/lib/libpcap: CHANGES Makefile README bpf_dump.c bpf_image.c
	    etherent.c ethertype.h fad-getad.c gencode.c gencode.h grammar.y
	    inet.c nametoaddr.c optimize.c pcap-bpf.c pcap-int.h pcap-namedb.h
	    pcap.3 pcap.c pcap.h ppp.h savefile.c scanner.l version.c
Removed Files:
	src/lib/libpcap: gnuc.h pcap-bpf.h pcap-stdinc.h

Log Message:
Resolve conflicts in libpcap-0.8.3 import.

Remove some extraneous files.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/lib/libpcap/CHANGES src/lib/libpcap/etherent.c
cvs rdiff -r1.25 -r1.26 src/lib/libpcap/Makefile
cvs rdiff -r1.5 -r1.6 src/lib/libpcap/README
cvs rdiff -r1.1.1.2 -r1.2 src/lib/libpcap/bpf_dump.c \
    src/lib/libpcap/fad-getad.c
cvs rdiff -r1.6 -r1.7 src/lib/libpcap/bpf_image.c src/lib/libpcap/ethertype.h \
    src/lib/libpcap/pcap-namedb.h
cvs rdiff -r1.34 -r1.35 src/lib/libpcap/gencode.c
cvs rdiff -r1.13 -r1.14 src/lib/libpcap/gencode.h \
    src/lib/libpcap/nametoaddr.c
cvs rdiff -r1.4 -r0 src/lib/libpcap/gnuc.h
cvs rdiff -r1.10 -r1.11 src/lib/libpcap/grammar.y src/lib/libpcap/pcap.h
cvs rdiff -r1.9 -r1.10 src/lib/libpcap/inet.c src/lib/libpcap/pcap-int.h \
    src/lib/libpcap/pcap.c
cvs rdiff -r1.15 -r1.16 src/lib/libpcap/optimize.c
cvs rdiff -r1.11 -r1.12 src/lib/libpcap/pcap-bpf.c
cvs rdiff -r1.1.1.2 -r0 src/lib/libpcap/pcap-bpf.h \
    src/lib/libpcap/pcap-stdinc.h
cvs rdiff -r1.19 -r1.20 src/lib/libpcap/pcap.3
cvs rdiff -r1.2 -r1.3 src/lib/libpcap/ppp.h
cvs rdiff -r1.7 -r1.8 src/lib/libpcap/savefile.c
cvs rdiff -r1.16 -r1.17 src/lib/libpcap/scanner.l
cvs rdiff -r1.3 -r1.4 src/lib/libpcap/version.c

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