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

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

Commits:

5adb6b2 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  7b58f02   x11: destroy two more hash tables in convo data
    adds  5adb6b2   [Automatic manuf, services and enterprise-numbers update for 2015-03-29]


Summary of changes:
 epan/dissectors/usb.c   |   32 ++++++
 epan/enterprise-numbers |  282 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   70 +++++++++++-
 manuf                   |   50 +++++++--
 4 files changed, 398 insertions(+), 36 deletions(-)