Wireshark-commits: [Wireshark-commits] master-1.12 d18f7f2: Fix display of composite tvbs in GUI

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 31 May 2016 20:30:00 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d18f7f2bbf3056649a98da40390007ff3af6d977
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

d18f7f2 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Fix display of composite tvbs in GUI
    
    a composite tvb is the top-level data source tvb
    
    Change-Id: Ibab58801a754fd88fb86b9a13804bccf2ad51c7a
    Reviewed-on: https://code.wireshark.org/review/15643
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 35feab8a4a43013f1a06374194ec93d4e64959b6)
    Conflicts:
    	epan/tvbuff_composite.c
    Reviewed-on: https://code.wireshark.org/review/15656
    

Actions performed:

    from  f540bd6   [Automatic update for 2016-05-29]
    adds  d18f7f2   Fix display of composite tvbs in GUI


Summary of changes:
 epan/tvbuff_composite.c |    1 +
 1 file changed, 1 insertion(+)