Wireshark-commits: [Wireshark-commits] master-1.12 c067619: Revert "Fix duplicate Display Filter Ma

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

Commits:

c067619 by Guy Harris (guy@xxxxxxxxxxxx):

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

Actions performed:

    from  225d3bf   Fix duplicate Display Filter Macro check
    adds  c067619   Revert "Fix duplicate Display Filter Macro check"


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