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

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

Commits:

3d492b1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  b040f11   RPKI-RTR: Missing break in switch (CID 1233099)
    adds  3d492b1   [Automatic manuf, services and enterprise-numbers update for 2014-12-07]


Summary of changes:
 epan/dissectors/usb.c   |   69 +-
 epan/enterprise-numbers |  208 +-
 epan/sminmpec.c         |   49 +-
 manuf                   | 6493 ++++++++++++++++++++++++-----------------------
 services                |    1 +
 5 files changed, 3597 insertions(+), 3223 deletions(-)