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

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

Commits:

b9cdc5d by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  8ae9b53   dec-dnart: use pinfo-scoped memory for addresses
    adds  b9cdc5d   [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(-)