URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8a5bce55df05b3d246004c978a5889adab231ba3
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
8a5bce5 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):
    dvb (s2): fix 'dvb-s2_bb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES
    
    Change-Id: If8fee9f8c27d32acecec975c7107b6e8203480ed
    Reviewed-on: https://code.wireshark.org/review/20706
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    
Actions performed:
    from  be528f3   Fixing TVB creation for PDUs in HS-DSCH Type 2 FP packets
    adds  8a5bce5   dvb (s2): fix 'dvb-s2_bb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES
Summary of changes:
 epan/dissectors/packet-dvb-s2-bb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)