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

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

Commits:

c0150ff by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  ecc4e43   prefs: fix crash with -o column.foo:x
    adds  c0150ff   [Automatic update for 2016-08-07]


Summary of changes:
 epan/enterprise-numbers |  152 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   35 ++++++++++-
 manuf                   |   54 ++++++++++++++++-
 3 files changed, 227 insertions(+), 14 deletions(-)