Wireshark-commits: [Wireshark-commits] master 8a5cd7a: ieee802154: fix 'wpan.tsch.timeslot' exists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 07 Mar 2018 08:00:25 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8a5cd7a5c67cdca5eed91ec6a36ba310772e795f
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    ieee802154: fix 'wpan.tsch.timeslot' exists multiple times with NOT compatible types: FT_UINT16 and FT_NONE
    
    Change-Id: I36ca5c469281f17e3ed9aebe1899648533a9b1a5
    Reviewed-on: https://code.wireshark.org/review/26323
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  99a3298   nas_5gs: fix duplicate entry
    adds  8a5cd7a   ieee802154: fix 'wpan.tsch.timeslot' exists multiple times with NOT compatible types: FT_UINT16 and FT_NONE


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