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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5bdb0fd953019e31d02308053f9e060621ccbef8
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

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

    ZBEE ZCL: fix hf conflict.
    
    'zbee_zcl_se.drlc.report_event.signature_type' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8
    
    Change-Id: I79bfd0178f46444a08f2350cddbc792ea480a173
    Reviewed-on: https://code.wireshark.org/review/33075
    Reviewed-by: Kenneth Soerensen <knnthsrnsn@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  04a4d1b   Dumpcap: Use win32strerror in more places.
     add  5bdb0fd   ZBEE ZCL: fix hf conflict.


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