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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=961f0cc8f50a28c052970b0446e6bd2a92ecb2ed
Submitter: Stig Bj?rlykke (stig@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

961f0cc by Stig Bjørlykke (stig@xxxxxxxxxxxxx):

    ui: Improved splitting custom column multi-field
    
    Improved the custom column prime regex so that all fields must be
    separated by "||" or "or" to avoid false positives when having
    multi-fields which is valid display filters but not valid for
    custom columns (e.g. "udp and tcp").
    
    Change-Id: Iec9942d458d6b265d04e14b5966907f1de43b782
    Reviewed-on: https://code.wireshark.org/review/12751
    Reviewed-by: Stig Bjørlykke <stig@xxxxxxxxxxxxx>
    (cherry picked from commit dc06d7f0f288a48621715fbd6cd61b02b17745f3)
    Reviewed-on: https://code.wireshark.org/review/12797
    

Actions performed:

    from  96526b2   Add COL_CUSTOM_PRIME_REGEX
    adds  961f0cc   ui: Improved splitting custom column multi-field


Summary of changes:
 epan/column-info.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)