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

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

Commits:

194fcdc by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  6eecb31   Fix up handling of the Kerberos package.
    adds  194fcdc   [Automatic update for 2018-04-22]


Summary of changes:
 AUTHORS                  |  2 ++
 enterprises.tsv          | 51 ++++++++++++++++++++++++++---
 manuf                    | 83 ++++++++++++++++++++++++++++++++++++++++--------
 services                 |  1 -
 ui/qt/wireshark_zh_CN.ts | 20 ++++++------
 5 files changed, 127 insertions(+), 30 deletions(-)