Wireshark-commits: [Wireshark-commits] master 0ce188a: HTTP2: fix 'http2' exists multiple times wit

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 3 Feb 2016 13:05:06 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ce188a9ebc0ef045eafaec63067d1a565b64e34
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    HTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL
    
    Change-Id: I5cb75b253c908994420107330743e808f57af2a4
    Reviewed-on: https://code.wireshark.org/review/13676
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  91613a0   pcapng (dissector): fix 'pcapng.options.option.data.ipv4' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    adds  0ce188a   HTTP2: fix 'http2' exists multiple times with NOT compatible types: FT_NONE and FT_PROTOCOL


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