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

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

Commits:

ff2061a by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  3229854   Get rid of trailing blank.
    adds  ff2061a   [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(-)