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

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

Commits:

693ae12 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  fad97e3   terminate readlink result
    adds  693ae12   [Automatic update for 2015-07-12]


Summary of changes:
 epan/enterprise-numbers |  144 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   35 +++++++++++-
 manuf                   |   53 ++++++++++++++---
 services                |    2 +-
 4 files changed, 218 insertions(+), 16 deletions(-)