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

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

Commits:

78a39b6 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  1e94413   ASN.1: regenerate dissectors after g092ccf4
    adds  78a39b6   [Automatic manuf, services and enterprise-numbers update for 2015-01-18]


Summary of changes:
 epan/dissectors/usb.c   |    1 -
 epan/enterprise-numbers |  144 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   35 +++++++++++-
 manuf                   |   55 +++++++++++++++++-
 4 files changed, 226 insertions(+), 9 deletions(-)