diff options
| author | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-09-04 19:54:21 +0000 |
| commit | 8bcc947abca2294c34328ac33c001fc8b000b77d (patch) | |
| tree | e0aa52f0d15c797ed6153b7446fd850742a6c1dd /contrib/libpcap/scanner.l | |
| parent | d439ca5cfb2e498bd8338759a5310dbd287201a7 (diff) | |
| download | FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.zip FreeBSD-src-8bcc947abca2294c34328ac33c001fc8b000b77d.tar.gz | |
resolve merge conflicts
MFC after: 1 month
Diffstat (limited to 'contrib/libpcap/scanner.l')
| -rw-r--r-- | contrib/libpcap/scanner.l | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l index 2bed45b..e231b0b 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.99.2.3 2005/06/20 21:30:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.99.2.4 2005/09/05 09:08:07 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -264,6 +264,8 @@ outbound return OUTBOUND; vlan return VLAN; mpls return MPLS; +pppoed return PPPOED; +pppoes return PPPOES; lane return LANE; llc return LLC; |
