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

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

Commits:

afa5558 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  de61f06   The packet encapsulation is in pkt_encap, not rec_type.
    adds  afa5558   [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(-)