Wireshark-commits: [Wireshark-commits] master-1.10 609e616: Revert "Fix duplicate Display Filter Ma

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 16 Feb 2015 03:15:35 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=609e616fbeb1c56036be6e0d6e50b24c74bac2d2
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

609e616 by Guy Harris (guy@xxxxxxxxxxxx):

    Revert "Fix duplicate Display Filter Macro check"
    
    This reverts commit 2fcc8b8f4d183a5f18e826c5615bcb4ee722f333.
    
    This is not a simple cherry-pick; backporting this fix will have to be done manually.
    
    Change-Id: If438f8f7e4b9f00ae08c70bad5a81d2c4bab7d6f
    Reviewed-on: https://code.wireshark.org/review/7154
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  2fcc8b8   Fix duplicate Display Filter Macro check
    adds  609e616   Revert "Fix duplicate Display Filter Macro check"


Summary of changes:
 epan/dfilter/dfilter-macro.c |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)