Commit Graph

13 Commits

Author SHA1 Message Date
mlaier
298dfd4f74 Resolve merge conflicts
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
2007-10-16 02:07:55 +00:00
sam
b0948cc146 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
sam
1907987c21 resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
bms
723e163490 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
fenner
1982c98f74 Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
fenner
d32fa93f24 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
archie
a66f7a68d6 Fix make world breakage.
Broken by:	me
2000-07-19 16:03:34 +00:00
fenner
787eaee1ab Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
fenner
eba95a7c80 Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
fenner
3e7c4bdb91 Merge libpcap 0.3
Update FREEBSD-upgrade to mention bumping library version number.

Suggested-by:	Chris Timmons <skynyrd@opus.cts.cwu.edu>
1997-05-27 00:05:23 +00:00
wollman
fb79103251 Update to reflect changes in net/if.h. 1997-01-03 20:10:04 +00:00
wollman
d3ecee07b3 Fix up programs which expect <net/if.h> to include <sys/time.h> to instead
do it themselves.  (Some of these programs actually depended on this
beyond compiling the definition of struct ifinfo!)  Also fix up some
other #include messes while we're at it.
1996-12-10 17:11:53 +00:00
pst
f0fdf33ff6 Virgin import of LBL libpcap version 0.2.1.
Obtained from: ftp://ftp.ee.lbl.gov/libpcap.tar.Z on 19-Aug-1996.
1996-08-19 20:36:34 +00:00