diff options
author | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
---|---|---|
committer | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
commit | a5779b6e02d0404232959eede5a5d3a5c699adaf (patch) | |
tree | 9e93e51a04c09c3b9b900ef6611b8bbd1290f26f /contrib/tcpdump/ipproto.h | |
parent | 6b6e256ae1f5d69b5e217c61109e55a30c30f81f (diff) | |
parent | 0ea0e7ad03dff03bb5448f640640d7904c01c8d4 (diff) | |
download | src-a5779b6e02d0404232959eede5a5d3a5c699adaf.tar.gz src-a5779b6e02d0404232959eede5a5d3a5c699adaf.zip |
Merge tcpdump 4.0.0 from the vendor branch.
Notes
Notes:
svn path=/head/; revision=190207
Diffstat (limited to 'contrib/tcpdump/ipproto.h')
-rw-r--r-- | contrib/tcpdump/ipproto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/tcpdump/ipproto.h b/contrib/tcpdump/ipproto.h index 1800db4580da..ea339b127116 100644 --- a/contrib/tcpdump/ipproto.h +++ b/contrib/tcpdump/ipproto.h @@ -30,11 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.4.2.2 2005/09/20 06:05:37 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.6 2005-09-20 06:01:22 guy Exp $ (LBL) * * From: * @(#)in.h 8.3 (Berkeley) 1/3/94 * $FreeBSD$ + * FreeBSD: src/sys/netinet/in.h,v 1.38.2.3 1999/08/29 16:29:34 peter Exp */ extern struct tok ipproto_values[]; |