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

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

Commits:

1b6da9e by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  1d598bb   Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
    adds  1b6da9e   [Automatic manuf, services and enterprise-numbers update for 2014-12-28]


Summary of changes:
 epan/enterprise-numbers |  194 ++++++++++++++++++++++++++++++++++++++++++-----
 epan/sminmpec.c         |   50 ++++++++++--
 manuf                   |    3 +
 services                |    1 +
 4 files changed, 226 insertions(+), 22 deletions(-)