Wireshark-commits: [Wireshark-commits] master-1.10 b765985: Small fixes to Follow Streams dialog bo

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 13 May 2014 05:13:23 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b765985eeb706e83b24c4d8d32462aa3f34665b4
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

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

    Small fixes to Follow Streams dialog box:
    - get the right IPv6 client address
    - display the right client to server string for UDP/SSL in Qt port
    
    Change-Id: I399cc38b8a32321198deccdd8e2ecd05b54e14db
    Reviewed-on: https://code.wireshark.org/review/1586
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    
    Conflicts:
    	ui/gtk/follow_ssl.c
    	ui/gtk/follow_udp.c
    	ui/qt/follow_stream_dialog.cpp
    
    (cherry picked from commit e2eea89698b7109d5271186200ab95d97ebc7981)
    
    Change-Id: Ifac6625ceb3103e1c82a9ca485a26a842a395aec
    Reviewed-on: https://code.wireshark.org/review/1611
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    

Actions performed:

    from  ccce29a   Don't build update-sminmpec by default when using CMake.
    adds  b765985   Small fixes to Follow Streams dialog box: - get the right IPv6 client address - display the right client to server string for UDP/SSL in Qt port


Summary of changes:
 ui/gtk/follow_ssl.c |    2 +-
 ui/gtk/follow_udp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)