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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=55dc9c042855414ece676d57e493d6b7a2085649
Submitter: "Michael Mann <mmann78@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

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

    usb-audio: fix conflict
    
    'usbaudio.as_if_gen.bmFormats.rsv' exists multiple times with NOT compatible types: FT_UINT32 and FT_BOOLEAN
    
    Change-Id: I908b815bfa0f96f2ec421367995d971040f423a1
    Reviewed-on: https://code.wireshark.org/review/34283
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  ef014f7   tshark: Complement manual page synopsis
     add  55dc9c0   usb-audio: fix conflict


Summary of changes:
 epan/dissectors/packet-usb-audio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)