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

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

Commits:

5c40ae0 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  c1911dd   Add missing scale in TDS type info
    adds  5c40ae0   [Automatic update for 2016-06-12]


Summary of changes:
 epan/enterprise-numbers  |   98 +++++++++++++++++++++++++++-
 epan/sminmpec.c          |   24 +++++++
 manuf                    |  158 +++++++++++++++++++++++++++++-----------------
 services                 |    1 +
 ui/qt/wireshark_zh_CN.ts |    2 +-
 5 files changed, 222 insertions(+), 61 deletions(-)