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

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

Commits:

fa2c7c0 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  6cf7711   6LoWPAN: fix storage of contexts coming from ICMPv6 Router Advertisement messages
    adds  fa2c7c0   [Automatic manuf, services and enterprise-numbers update for 2014-09-07]


Summary of changes:
 epan/enterprise-numbers |  150 ++++++++++++++++++++++++++++++++++++++++++++---
 epan/sminmpec.c         |   36 +++++++++++-
 manuf                   |   41 ++++++++++++-
 services                |    2 +-
 4 files changed, 219 insertions(+), 10 deletions(-)