Wireshark-commits: [Wireshark-commits] master 0212739: One more cf_merge_files_to_tempfile() call n

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 21 Jan 2017 08:24:53 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=02127395981932bd6262d2107b78820ca4ace45b
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0212739 by Guy Harris (guy@xxxxxxxxxxxx):

    One more cf_merge_files_to_tempfile() call needed to be changed.
    
    Change-Id: Id109e316714fd1c4843f9ffe1b866ec0e5f5c126
    Reviewed-on: https://code.wireshark.org/review/19719
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a5fe96e   Qt: Fixup drag and drop merging.
    adds  0212739   One more cf_merge_files_to_tempfile() call needed to be changed.


Summary of changes:
 ui/qt/main_window.cpp |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)