Wireshark-commits: [Wireshark-commits] master-2.0 d54e500: Clean up from cherry-picking.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 10 Oct 2015 17:38:54 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d54e50098770ed5a8fdd087b8dd2cba05c817fbd
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

d54e500 by Guy Harris (guy@xxxxxxxxxxxx):

    Clean up from cherry-picking.
    
    I think two changes were cherry-picked in reverse order, which left
    duplicate declarations and definitions of addPlayerButton.
    
    Change-Id: I553f28c80695537207e5fc353c2833e863c37c3a
    Reviewed-on: https://code.wireshark.org/review/10924
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  8d8d1c9   Qt: Add a play button to the RTP Stream Analysis dialog.
    adds  d54e500   Clean up from cherry-picking.


Summary of changes:
 ui/qt/rtp_player_dialog.cpp |   10 ----------
 ui/qt/rtp_player_dialog.h   |    8 --------
 2 files changed, 18 deletions(-)