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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6d2796f2784c5bb325b8740cb2a3a2936eb32ba5
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.8
Repository: wireshark

Commits:

6d2796f by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2014-05-25]
    
    Change-Id: I87588b512a643a5c560a8d71a30a7f36db2c04c0
    Reviewed-on: https://code.wireshark.org/review/1792
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  4a91654   [Automatic manuf, services and enterprise-numbers update for 2014-05-18]
    adds  6d2796f   [Automatic manuf, services and enterprise-numbers update for 2014-05-25]


Summary of changes:
 epan/enterprise-numbers |  160 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   38 ++++++++++-
 manuf                   |   93 +++++++++++++++++++--------
 services                |    8 +--
 4 files changed, 261 insertions(+), 38 deletions(-)