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

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

Commits:

e1c548e by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2014-08-10]
    
    Change-Id: I18fca49b0ac3b5385805edb85151e5bb994a13f5
    Reviewed-on: https://code.wireshark.org/review/3532
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  968c57d   Fix regression introduced by gf3b631668b
    adds  e1c548e   [Automatic manuf, services and enterprise-numbers update for 2014-08-10]


Summary of changes:
 epan/dissectors/usb.c   |    4 +
 epan/enterprise-numbers |  198 ++++++++++++++++++++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   48 ++++++++++++
 manuf                   |   35 +++++++++
 services                |    3 +-
 5 files changed, 284 insertions(+), 4 deletions(-)