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

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

Commits:

539b6b4 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2015-01-18]
    
    Change-Id: Ia6171f1e260b4936a495aab8446dd78cfd50a255
    Reviewed-on: https://code.wireshark.org/review/6624
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  8c2f2b2   Novell PKIS: handle 64 bits contraint
    adds  539b6b4   [Automatic manuf, services and enterprise-numbers update for 2015-01-18]


Summary of changes:
 epan/dissectors/usb.c   |    1 -
 epan/enterprise-numbers |  144 +++++++++++++++++++++++++++++++++++++++++++++--
 epan/sminmpec.c         |   35 +++++++++++-
 manuf                   |   55 +++++++++++++++++-
 4 files changed, 226 insertions(+), 9 deletions(-)