Wireshark-commits: [Wireshark-commits] master 390674f: uds: Fix conflict for hf fields

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 20 Nov 2016 17:19:42 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=390674f309eb84215281b1b97254fc4936554a18
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    uds: Fix conflict for hf fields
    
    'uds.tp.suppress_reply' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    
    Change-Id: I8f6035c79c7b6481dd2915cfcfc99963fef7fc23
    Reviewed-on: https://code.wireshark.org/review/18884
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  95325a2   hsms: Fix conflict for hf fields
    adds  390674f   uds: Fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-uds.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)