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

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

Commits:

88f65ca by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  08e5d9a   radiotap: Fix conflict for hf fields
    adds  88f65ca   [Automatic update for 2016-11-20]


Summary of changes:
 AUTHORS                 |    4 +
 epan/dissectors/usb.c   |    2 +-
 epan/enterprise-numbers |  278 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   68 +++++++++++-
 manuf                   |   40 +++++++
 services                |    6 +-
 6 files changed, 382 insertions(+), 16 deletions(-)