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

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

Commits:

9cee3d9 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  336ccc1   dec-dnart: use pinfo-scoped memory for addresses
    adds  9cee3d9   [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(-)