Wireshark-commits: [Wireshark-commits] master-2.0 9b052f1: ZEP: fix 'zep.seqno' exists multiple tim

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 27 Feb 2016 18:43:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9b052f1af893142cf5155c565d27af23e9f4c3ed
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

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

    ZEP: fix 'zep.seqno' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
    
    Change-Id: I8d39436efaa5b561a95b08b5849b200a51e3c981
    Reviewed-on: https://code.wireshark.org/review/14204
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit bebe51e2c59e4aa331349d88a42f5e19cd4b5cd5)
    Reviewed-on: https://code.wireshark.org/review/14210
    

Actions performed:

    from  b58dce8   Zbee (Security): fix 'zbee.sec.key' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8
    adds  9b052f1   ZEP: fix 'zep.seqno' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8


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