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

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

Commits:

b9dfdd3 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2014-08-03]
    
    Change-Id: I59fbca5004187ab8e0da653c37d93f358352c71f
    Reviewed-on: https://code.wireshark.org/review/3381
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  61abd97   HTTP2: Add a preference to enable/disable HTTP2 (weak) heuristics
    adds  b9dfdd3   [Automatic manuf, services and enterprise-numbers update for 2014-08-03]


Summary of changes:
 epan/enterprise-numbers |  132 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   32 +++++++++++-
 manuf                   |   37 +++++++++++++
 services                |    7 ++-
 4 files changed, 194 insertions(+), 14 deletions(-)