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

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

Commits:

cee362a by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  3ab69e0   x509ce: fix display of IPAddress when it is an IPv6 Address
    adds  cee362a   [Automatic update for 2018-04-15]


Summary of changes:
 AUTHORS                  |   1 +
 enterprises.tsv          |  64 +++++-
 epan/dissectors/usb.c    |  44 +++-
 manuf                    |  65 +++++-
 ui/qt/wireshark_ja_JP.ts | 581 +++++++++++++++++++++++++----------------------
 5 files changed, 477 insertions(+), 278 deletions(-)