Wireshark-commits: [Wireshark-commits] master-2.0 e2f13ba: irda: fix 'irlmp.xid.name' exists multip
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 27 Feb 2016 18:45:51 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e2f13bac62d1d2ab7c91ce7f7143c67331e722e5
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
    
    Change-Id: I93215bd126dab1e7b6207f8510c7ce9b116637a3
    Reviewed-on: https://code.wireshark.org/review/14203
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 9ef7b92193e4cb4e49028522f4ce5d9983d94954)
    Reviewed-on: https://code.wireshark.org/review/14212
    

Actions performed:

    from  e065b79   Zbee (zcl se): fix 'zbee_zcl_se.ke.cert.type' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT
    adds  e2f13ba   irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING


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