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

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

Commits:

f540bd6 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  d3bb091   Don't use proto_tree_add_subtree().
    adds  f540bd6   [Automatic update for 2016-05-29]


Summary of changes:
 epan/enterprise-numbers |  172 ++++++++++++++++++++++--
 epan/sminmpec.c         |   47 ++++++-
 manuf                   |  339 +++++++++++++++++++++++++++--------------------
 services                |    1 +
 4 files changed, 395 insertions(+), 164 deletions(-)