Wireshark-commits: [Wireshark-commits] master-2.0 48e6087: Zbee (nwk): fix 'zbee_nwk.multicast' exi

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, 27 Feb 2016 18:47:48 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=48e6087aaecfe8944c4a6b482c2fe4e916e0c26d
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
    
    Change-Id: I5947b0543e0b6270cbef69184360c19e2d25c8e0
    Reviewed-on: https://code.wireshark.org/review/14205
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 4ef2e2f38933b5d615ff4d56f64e9d736427025c)
    Reviewed-on: https://code.wireshark.org/review/14213
    

Actions performed:

    from  e2f13ba   irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
    adds  48e6087   Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN


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