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

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

Commits:

1d85e52 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  d38f510   [iSCSI] Fix incorrect heuristic.
    adds  1d85e52   [Automatic manuf, services and enterprise-numbers update for 2014-10-12]


Summary of changes:
 epan/enterprise-numbers |  150 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   38 +++++++++++-
 manuf                   |   39 +++++++++---
 services                |    2 +-
 4 files changed, 212 insertions(+), 17 deletions(-)