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

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

Commits:

018bbdf by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  1639c74   tcp: only reset dupACK counter when ACk# changes
    adds  018bbdf   [Automatic update for 2015-08-02]


Summary of changes:
 epan/dissectors/usb.c   |    9 +++
 epan/enterprise-numbers |  158 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   39 +++++++++++-
 manuf                   |   40 +++++++++++-
 services                |    2 +-
 5 files changed, 234 insertions(+), 14 deletions(-)