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

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

Commits:

249bdd3 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  752624e   Fix backwards #if defined.
    adds  249bdd3   [Automatic update for 2017-01-01]


Summary of changes:
 AUTHORS                 |    1 +
 epan/enterprise-numbers |  138 +-
 epan/sminmpec.c         |   33 +-
 manuf                   |22752 ++---------------------------------------------
 4 files changed, 978 insertions(+), 21946 deletions(-)