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

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

Commits:

10046cc by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  090a046   Update to reflect current reality.
    adds  10046cc   [Automatic manuf, services and enterprise-numbers update for 2014-11-30]


Summary of changes:
 epan/enterprise-numbers |   32 ++++++++++++++++++++++++++------
 epan/sminmpec.c         |    9 +++++++--
 manuf                   |    7 ++++++-
 services                |    1 +
 4 files changed, 40 insertions(+), 9 deletions(-)