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

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

Commits:

f174370 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  e8a8d62   proto_tree_add_subtree[_format]
    adds  f174370   [Automatic manuf, services and enterprise-numbers update for 2014-06-29]


Summary of changes:
 epan/dissectors/usb.c   |   41 +++++++++++--
 epan/enterprise-numbers |  152 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   41 +++++++++++--
 manuf                   |   37 ++++++++++++
 services                |    5 +-
 5 files changed, 254 insertions(+), 22 deletions(-)