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

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

Commits:

ac6c49b by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  434451f   asciidoc.conf, sort-and-group: remove "and" if we have only one element
    adds  ac6c49b   [Automatic update for 2016-08-14]


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