diff options
author | Gerald Combs <gerald@wireshark.org> | 2017-06-20 11:43:07 -0400 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2017-06-22 16:24:02 +0000 |
commit | 27b6fe440835391f5a602780edf4ec1a0a78aeab (patch) | |
tree | a55618505abb805f5d438dfcec0d9a59b51cb343 | |
parent | 8ddc581336b64f783cf4e5e7ca8ffa37605c8576 (diff) | |
download | wireshark-27b6fe440835391f5a602780edf4ec1a0a78aeab.tar.gz |
Manuf: Konica Minolta updates.
Correct a couple of entries related to Konica Minolta.
Change-Id: I3acea1cf7ab1ad9be5d1b367a1015f5205b9e80b
Reviewed-on: https://code.wireshark.org/review/22268
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit c919c625025afdca318a1a3413b268d00ad1985c)
Reviewed-on: https://code.wireshark.org/review/22356
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | manuf.tmpl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/manuf.tmpl b/manuf.tmpl index 8758cf4bcf..74fbf0eacf 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -268,7 +268,6 @@ 00:20:63 WiproInf # Wipro Infotech Ltd 00:20:66 GeneralM # General Magic Inc 00:20:67 NodeRunn # Node Runner Inc -00:20:6B MinoltaL # Minolta Co., Ltd Network printers 00:20:78 Runtop # Runtop Inc 00:20:85 3Com 00:20:8A SonixCom # Sonix Communications Ltd @@ -916,7 +915,7 @@ 08:00:80 Xios 08:00:81 Crosfiel # Crosfield Electronics 08:00:83 SeikoDen # Seiko Denshi -08:00:86 Imagen/Q # Imagen/QMS +08:00:86 Imagen/Q # Imagen/QMS [Now Konica Minolta] 08:00:87 XyplexTe # Xyplex terminal servers 08:00:88 Mcdata # McDATA Corporation 08:00:89 Kinetics # Kinetics AppleTalk-Ethernet interface |