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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=08e4d57ec452a1b809297af71f6bfb60bf503fb7
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

08e4d57 by Michael Mann (mmann78@xxxxxxxxxxxx):

    Bluetooth: fix conflicting entries in its value_string.
    
    Change-Id: Ie0f9bc800b5d86effa18a8ae333bbf8da18d0c3b
    Reviewed-on: https://code.wireshark.org/review/20775
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@xxxxxxxxx>
    

Actions performed:

    from  f706011   TLS: fix decryption with Encrypt-then-MAC (RFC 7366)
    adds  08e4d57   Bluetooth: fix conflicting entries in its value_string.


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