diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | 7dacff5dd0aeebda55a754dc5d25feab441b5d03 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/print-bootp.c | |
| parent | d9db21b8bcec89e09ac680f84c6d7d0ca014d6df (diff) | |
| download | FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.zip FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.tar.gz | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Diffstat (limited to 'contrib/tcpdump/print-bootp.c')
| -rw-r--r-- | contrib/tcpdump/print-bootp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c index aedda0c..9fe96d7 100644 --- a/contrib/tcpdump/print-bootp.c +++ b/contrib/tcpdump/print-bootp.c @@ -24,7 +24,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.75.2.3 2004/03/02 07:45:13 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78 2004/03/02 07:38:10 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H |
