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

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

Commits:

3f6fd3c by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  f4dc810   TCP: improve handling of unknown TCP options
    adds  3f6fd3c   [Automatic update for 2018-04-22]


Summary of changes:
 enterprises.tsv          | 51 ++++++++++++++++++++++++++---
 manuf                    | 83 ++++++++++++++++++++++++++++++++++++++++--------
 services                 |  1 -
 ui/qt/wireshark_ja_JP.ts | 34 ++++++++++----------
 4 files changed, 132 insertions(+), 37 deletions(-)