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

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

Commits:

646f680 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  bec9499   6LoWPAN: fix dissection when using multicast address compression
    adds  646f680   [Automatic manuf, services and enterprise-numbers update for 2014-08-31]


Summary of changes:
 epan/dissectors/usb.c   |    2 +-
 epan/enterprise-numbers |  170 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   42 +++++++++++-
 manuf                   |   33 ++++++++-
 services                |    9 +--
 5 files changed, 238 insertions(+), 18 deletions(-)