Wireshark-commits: [Wireshark-commits] master a187382: IAX2: fix 'iax2.video.marker' exists multipl

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 7 Apr 2016 15:32:54 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a1873821583eb39be5192ad9eb98541d4ad00a44
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

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

    IAX2: fix 'iax2.video.marker' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT16
    
    Change-Id: I12895f2a08c8a4d8408f109f5aebb53555f458d5
    Reviewed-on: https://code.wireshark.org/review/14839
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  e4b648c   L2TP: fix 'l2tp.avp.csu.current_t/rx_speed' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
    adds  a187382   IAX2: fix 'iax2.video.marker' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT16


Summary of changes:
 epan/dissectors/packet-iax2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)