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

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

Commits:

56dbe51 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  489b06e   Make some inconsistent configuration options errors.
    adds  56dbe51   [Automatic update for 2015-08-16]


Summary of changes:
 epan/enterprise-numbers |  150 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   35 +++++++++++
 manuf                   |   35 ++++++++++-
 3 files changed, 214 insertions(+), 6 deletions(-)