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

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

Commits:

afa9b8a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Don't discard unknown coloring rules.
    
    When processing the colorfilters file, keep and disable unknown coloring
    rules instead of skipping over and discarding them. This should
    hopefully keep people from losing the standard "Checksum Errors" rule
    (and it's less rude in general).
    
    Conflicts:
    	epan/color_filters.c
    
    Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f
    Reviewed-on: https://code.wireshark.org/review/16673
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit e727ecf5e302c9f765d0038b234e6775fb4ca45b)
    Reviewed-on: https://code.wireshark.org/review/16765
    

Actions performed:

    from  0debe43   GTP: fix dissection of NSAPI
    adds  afa9b8a   Don't discard unknown coloring rules.


Summary of changes:
 color_filters.c                 |    4 ++--
 docbook/release-notes.asciidoc  |    3 +++
 ui/qt/coloring_rules_dialog.cpp |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)