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

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

Commits:

a69abe8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  4fe6516   Kerberos: do not store empty keys
    adds  a69abe8   [Automatic update for 2018-04-01]


Summary of changes:
 epan/dissectors/usb.c   |   2 +-
 epan/enterprise-numbers | 222 +++++++++++++++++++++++++++++++++++++++++-------
 epan/sminmpec.c         |  58 +++++++++++--
 manuf                   |  51 +++++++++--
 services                |   5 +-
 5 files changed, 289 insertions(+), 49 deletions(-)