Wireshark-commits: [Wireshark-commits] master-2.0 4b1b500: [Automatic update for 2016-08-14]

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 14 Aug 2016 15:26:21 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4b1b5002dbabb811302b455f1bdc7591de284131
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

4b1b500 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2016-08-14]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: Ia80f20fd0a32495600cb65f4a675a0e1252a4239
    Reviewed-on: https://code.wireshark.org/review/17051
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  10509f6   asciidoc.conf, sort-and-group: remove "and" if we have only one element
    adds  4b1b500   [Automatic update for 2016-08-14]


Summary of changes:
 epan/dissectors/usb.c   |    2 ++
 epan/enterprise-numbers |   86 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   21 +++++++++++-
 manuf                   |   52 ++++++++++++++++++++++------
 4 files changed, 144 insertions(+), 17 deletions(-)