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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c3706a9226dc38f76107da349734a0f928c90c1a
Submitter: Michal Labedzki (michal.labedzki@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    bthci_evt: Fix conflict for hf fields
    
    'bthci_evt.pending_response_delta' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_DOUBLE
    
    Change-Id: I7665ea0c007ef089c6986c102f2358d08d4628df
    Reviewed-on: https://code.wireshark.org/review/18889
    Petri-Dish: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michal Labedzki <michal.labedzki@xxxxxxxxx>
    

Actions performed:

    from  3bf6a18   Fix -1 lengths in proto_tree_add_item_ret_string_and_length().
    adds  c3706a9   bthci_evt: Fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-bthci_evt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)