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

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

Commits:

307b101 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  5420bbf   tshark: fix -H option
    adds  307b101   [Automatic manuf, services and enterprise-numbers update for 2014-09-28]


Summary of changes:
 epan/enterprise-numbers |  156 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   37 +++++++++++
 manuf                   |   28 +++++++++
 services                |    5 +-
 4 files changed, 220 insertions(+), 6 deletions(-)