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

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

Commits:

0ed5e1a by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  72bd999   win32: use target file format when checking if it supports comments
    adds  0ed5e1a   [Automatic manuf, services and enterprise-numbers update for 2014-12-07]


Summary of changes:
 epan/dissectors/usb.c   |   69 +-
 epan/enterprise-numbers |  208 +-
 epan/sminmpec.c         |   49 +-
 manuf                   | 6493 ++++++++++++++++++++++++-----------------------
 services                |    1 +
 5 files changed, 3597 insertions(+), 3223 deletions(-)