diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 18:09:04 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 18:09:04 +0000 |
| commit | 1907987c215571d956467e511af31fb08df5e7ae (patch) | |
| tree | 792afbbcf047be9dd1402f871834480d01679ee8 /contrib/libpcap/scanner.l | |
| parent | 3fcae53268f8352ec4919fb2b103f016893c2a1b (diff) | |
| download | FreeBSD-src-1907987c215571d956467e511af31fb08df5e7ae.zip FreeBSD-src-1907987c215571d956467e511af31fb08df5e7ae.tar.gz | |
resolve merge conflicts
Reviewed by: bms (earlier version)
Diffstat (limited to 'contrib/libpcap/scanner.l')
| -rw-r--r-- | contrib/libpcap/scanner.l | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l index 21e8002..8be0cae 100644 --- a/contrib/libpcap/scanner.l +++ b/contrib/libpcap/scanner.l @@ -24,7 +24,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.95.2.3 2004/03/28 21:45:33 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99 2004/06/16 08:20:28 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -261,6 +261,7 @@ inbound return INBOUND; outbound return OUTBOUND; vlan return VLAN; +mpls return MPLS; lane return LANE; llc return LLC; |
