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

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

Commits:

c605168 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2018-05-06]
    
    Update manuf, services enterprise numbers, translations, and other items.
    
    Change-Id: I7a639871a5fee088c55be6efe10b6f9a3e47a174
    Reviewed-on: https://code.wireshark.org/review/27374
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  3f3f742   tcp: fix memleak in Follow TCP tap in error cases
    adds  c605168   [Automatic update for 2018-05-06]


Summary of changes:
 AUTHORS                 |   1 +
 epan/dissectors/usb.c   |   2 +-
 epan/enterprise-numbers | 204 +++++++++++++++++++++++++++++++++++++++++-------
 epan/sminmpec.c         |  47 +++++++++--
 manuf                   |  46 ++++++++++-
 5 files changed, 264 insertions(+), 36 deletions(-)