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

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

Commits:

0f87e8e by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  32309cb   Pick the *first* usable file type as the default, not the *last* one.
    adds  0f87e8e   [Automatic update for 2018-04-29]


Summary of changes:
 AUTHORS                 |   1 +
 epan/enterprise-numbers | 186 ++++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |  46 +++++++++++-
 manuf                   |  74 ++++++++++++++-----
 4 files changed, 275 insertions(+), 32 deletions(-)