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

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

Commits:

5402ae1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  f94ad09   Get the handle for the pw_hdlc_nocw_hdlc_ppp dissector.
    adds  5402ae1   [Automatic manuf, services and enterprise-numbers update for 2014-06-22]


Summary of changes:
 epan/enterprise-numbers |  158 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   41 +++++++++++-
 manuf                   |   39 +++++++++++-
 services                |    3 +-
 4 files changed, 226 insertions(+), 15 deletions(-)