git.samba.org
/
metze
/
wireshark
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e4a12e
)
Remove 00:40:96 from manuf.tmpl (Aironet, Ciron).
author
jmayer
<jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 5 Mar 2003 17:29:33 +0000
(17:29 +0000)
committer
jmayer
<jmayer@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 5 Mar 2003 17:29:33 +0000
(17:29 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7288
f5534014
-38df-0310-8fa8-
9805f1628bb7
manuf.tmpl
patch
|
blob
|
history
diff --git
a/manuf.tmpl
b/manuf.tmpl
index 2d1e37ab99ecf7717edabdca98b6ff288a3aca03..f7bec5d92b1c9f4eec1278f052236d649c4263dc 100644
(file)
--- a/
manuf.tmpl
+++ b/
manuf.tmpl
@@
-1,7
+1,7
@@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf.tmpl,v 1.
9 2003/01/26 19:35:23 deniel
Exp $
+# $Id: manuf.tmpl,v 1.
10 2003/03/05 17:29:33 jmayer
Exp $
#
# Laurent Deniel <laurent.deniel@free.fr>
#
@@
-233,8
+233,6
@@
00:30:f2 Cisco
00:40:0b Cresc
00:40:8c Axis
-00:40:96 Aironet # Cisco
-00:40:96 Ciron
00:40:a6 Cray
00:40:c8 Milan
00:50:0b Cisco