Wireshark · Wireshark-dev: [Wireshark-dev] Fix lost in trunk-1.0?

["David Bernard" <jerrydav@xxxxxxxxx>]

How do you proceed to sync the trunk-1.0 with the main trunk? Because I fear that a fix has been lost in the process.

If you compare the epan/dissectors/packet-mikey.c file between the main trunk and the trunk-1.0, you can see the revision 24833 is missing in the trunk-1.0, even if a newer revision (25146) has been ported to the trunk-1.0. So it seems to me a revision has been forgotten in the syncing process between the main trunk and the 1.0 trunk.

Regards,
David