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

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

Commits:

8b6c3bb by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  ee37b7d   packet-wsp.c: Fix infinite loop in add_headers
    adds  8b6c3bb   [Automatic update for 2016-07-10]


Summary of changes:
 epan/enterprise-numbers |  130 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   32 +++++++++++-
 manuf                   |   84 ++++++++++++++++++++++++------
 services                |    1 +
 4 files changed, 221 insertions(+), 26 deletions(-)