Commit Graph

15 Commits

Author SHA1 Message Date
Sam Leffler
ff252dbedb resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
Sam Leffler
4238c2cd94 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
Sam Leffler
c761ebcb2c resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
Bruce M Simpson
eb9f0330c0 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
Brian Feldman
fe1e903532 Remove a reference to part of the pcap API not yet merged. 2003-11-04 06:16:55 +00:00
Bill Fenner
6121e7f0d2 Merge multi-DLT support. 2003-01-26 01:21:53 +00:00
Bill Fenner
c0653930da Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
Bill Fenner
8e1481d144 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
Bill Fenner
fae05455f6 Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
Bill Fenner
dfd1ee14ff Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
Bill Fenner
4c6f72b0be 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
Peter Wemm
99a60da8f1 Back out an easy $FreeBSD$ (file already left vendor branch) 1997-02-22 10:53:59 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Wolfram Schneider
e83201b43a delete doubled words, e.g.: "the the" -> "the" 1996-10-05 22:27:30 +00:00
Paul Traina
8cf6c252e7 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