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

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

Commits:

e1a420a by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  1952d95   CMake: Add conditional builds.
    adds  e1a420a   [Automatic manuf, services and enterprise-numbers update for 2014-09-21]


Summary of changes:
 epan/enterprise-numbers |  204 ++++++++++++++++++++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   51 +++++++++++-
 manuf                   |   30 +++++++
 services                |    2 +
 4 files changed, 282 insertions(+), 5 deletions(-)