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

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

Commits:

c591cfe by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  6bef686   P1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]
    adds  c591cfe   [Automatic update for 2016-05-15]


Summary of changes:
 epan/enterprise-numbers |  288 +++++++++++++++++++++++++++++++++++++++++------
 epan/sminmpec.c         |   72 ++++++++++--
 manuf                   |   47 +++++++-
 services                |    7 +-
 4 files changed, 365 insertions(+), 49 deletions(-)