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

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

Commits:

916c88e by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  38da859   Add missing ERF types, mention another missing type, mention reserved space.
    adds  916c88e   [Automatic update for 2015-12-20]


Summary of changes:
 epan/dissectors/usb.c   |  245 ++++++++++++++++++++++++++++++++++-------------
 epan/enterprise-numbers |  128 +++++++++++++++++++++++--
 epan/sminmpec.c         |   31 +++++-
 manuf                   |   48 +++++++++-
 4 files changed, 373 insertions(+), 79 deletions(-)