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

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

Commits:

9aa3d94 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  57a2086   isakmp: allow IKEv1 decryption with non-PSK authentication
    adds  9aa3d94   [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(-)