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

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

Commits:

2ee11f7 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  64c9597   When configuring with Wireshark disabled, don't complain if uic and moc aren't found.
    adds  2ee11f7   [Automatic update for 2015-05-03]


Summary of changes:
 epan/dissectors/usb.c   |   10 +++
 epan/enterprise-numbers |  200 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   51 +++++++++++-
 manuf                   |   40 +++++++++-
 services                |    4 +-
 5 files changed, 290 insertions(+), 15 deletions(-)