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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=fa20bbb677e7adfdf2761025fc16c5abff077ed4
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    fix exists multiple times with NOT compatible types: IPv4/IPv6/Bytes
    
    'rsip.parameter.address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'sap.originating_source' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'sflow_245.nexthop' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    
    Change-Id: Idabe9adafac2e11f2e90a494e5fac1a341edca33
    Reviewed-on: https://code.wireshark.org/review/14091
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  5635f49   Get rid of trailing white space.
    adds  fa20bbb   fix exists multiple times with NOT compatible types: IPv4/IPv6/Bytes


Summary of changes:
 epan/dissectors/packet-rsip.c  |    2 +-
 epan/dissectors/packet-sap.c   |    2 +-
 epan/dissectors/packet-sflow.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)