[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9c036553ab1bb6433be0f443e057e9763ab2f7ec
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9c03655 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2014-12-21]
    
    Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb
    Reviewed-on: https://code.wireshark.org/review/5945
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  f002332   Replace ether_to_str with either address_to_str or tvb_ether_to_str.
    adds  9c03655   [Automatic manuf, services and enterprise-numbers update for 2014-12-21]


Summary of changes:
 epan/enterprise-numbers |  210 ++++++++++++++++++++++++++++++++++++++++++-----
 epan/sminmpec.c         |   53 ++++++++++--
 manuf                   |   75 ++++++++++++++++-
 services                |    6 +-
 4 files changed, 314 insertions(+), 30 deletions(-)