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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d801c7fb9e6a8b647a910918470f33b69563d067
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

d801c7f by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic manuf, services and enterprise-numbers update for 2014-06-08]
    
    Change-Id: Iee71c0f722e297f3c7862fc21c6e8ceb7c556421
    Reviewed-on: https://code.wireshark.org/review/2037
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  ff44f34   PEEKREMOTE packets don't appear to have Atheros padding.
    adds  d801c7f   [Automatic manuf, services and enterprise-numbers update for 2014-06-08]


Summary of changes:
 epan/enterprise-numbers |  246 ++++++++++++++++++++++++++++++++++++++++++++++-
 epan/sminmpec.c         |   62 +++++++++++-
 manuf                   |   27 ++++++
 services                |    2 +
 4 files changed, 333 insertions(+), 4 deletions(-)