Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-2.0 f997ee8: [Automatic update for 2016-12-25]

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 25 Dec 2016 16:55:38 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f997ee8ba33d62dc92c8742bd87725a17e8e0c6b
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

f997ee8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2016-12-25]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I756194ca48da05d630139275bf475a7ea349451b
    Reviewed-on: https://code.wireshark.org/review/19431
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  cd3a31d   Avoid recursive scan_local_interfaces operation
    adds  f997ee8   [Automatic update for 2016-12-25]


Summary of changes:
 epan/enterprise-numbers |  240 ++++++++++++++++++++++++++++++++++++++++++-----
 epan/sminmpec.c         |   59 +++++++++++-
 manuf                   |   53 ++++++++++-
 services                |    2 +
 4 files changed, 324 insertions(+), 30 deletions(-)