Wireshark-commits: [Wireshark-commits] master-2.0 033b1d6: Assa (R3): fix 'r3.forceoptions.state' e

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 12 Mar 2016 03:26:29 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=033b1d616c4d46f1668337802ded43f1233fdb74
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    Assa (R3): fix 'r3.forceoptions.state' exists multiple times with NOT compatible types: FT_UINT16 and FT_BOOLEAN
    
    Change-Id: I6bae0af90fd9604dbc9c484d119580adbb11b914
    Reviewed-on: https://code.wireshark.org/review/14422
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 9775fbe7d8d8cecca959e08008f7b3d2af082e55)
    Reviewed-on: https://code.wireshark.org/review/14434
    

Actions performed:

    from  5fd5ebc   Qt: Defer proto tree column content resizing.
    adds  033b1d6   Assa (R3): fix 'r3.forceoptions.state' exists multiple times with NOT compatible types: FT_UINT16 and FT_BOOLEAN


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