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

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

Commits:

46e0b96 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  fa0831b   [Automatic update for 2016-04-03]
    adds  46e0b96   [Automatic update for 2016-04-10]


Summary of changes:
 epan/enterprise-numbers |  180 ++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   46 ++++++++-
 manuf                   |  253 +++++++++++++++++++++++++++--------------------
 services                |    1 +
 4 files changed, 356 insertions(+), 124 deletions(-)