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

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

Commits:

703eb05 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2015-02-01]
    
    Change-Id: I767e8d0e11a928edd38a6bd610ac909911020186
    Reviewed-on: https://code.wireshark.org/review/6889
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  06a0cfa   BSSGP: ensure that all Optional / Conditional Information Elements are treated as such
    adds  703eb05   [Automatic manuf, services and enterprise-numbers update for 2015-02-01]


Summary of changes:
 epan/dissectors/usb.c   |    1 +
 epan/enterprise-numbers |  276 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   69 +++++++++++-
 manuf                   |   53 ++++++++-
 services                |    1 +
 5 files changed, 379 insertions(+), 21 deletions(-)