Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master-1.10 490cf7c: [Automatic manuf, services and enterpri

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 20 Jul 2014 15:11:47 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=490cf7c6f92ed5a12eea4820b25b2251622e72e3
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

490cf7c by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  9cf8930   Fix install_desktop_files non-portability and add out-of-tree support.
    adds  490cf7c   [Automatic manuf, services and enterprise-numbers update for 2014-07-20]


Summary of changes:
 epan/enterprise-numbers |  226 +++++++++++++++++++++++++++++++++++++++++++----
 epan/sminmpec.c         |   59 +++++++++++--
 manuf                   |   35 +++++++-
 services                |   14 +--
 4 files changed, 300 insertions(+), 34 deletions(-)