Wireshark-commits: [Wireshark-commits] master 4f3a889: Add conflict check filter

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 7 Mar 2016 07:57:43 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4f3a88989ed6794134cc94ad678dce730f2fd1e3
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

4f3a889 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    Add conflict check filter
    
    Set ENABLE_CHECK_FILTER to 1 for get list of display filter with conflict...
    
    Ping-Bug:2402
    Change-Id: I8d56b1573120d1a29d437aae1088be242e15e9a3
    Reviewed-on: https://code.wireshark.org/review/13644
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  6ea3f37   generate_authors: Align git log email column
    adds  4f3a889   Add conflict check filter


Summary of changes:
 CMakeLists.txt   |    4 ++++
 CMakeOptions.txt |    1 +
 cmakeconfig.h.in |    3 +++
 configure.ac     |    8 ++++++++
 epan/proto.c     |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 71 insertions(+), 1 deletion(-)