Wireshark-commits: [Wireshark-commits] master-1.10 460db8a: tshark.c: Backport 68a1b55 (with change

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 4 Jun 2014 20:58:15 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=460db8ac53df696058184b729d4446904fab1e6f
Submitter: Bill Meier (wmeier@xxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

460db8a by Bill Meier (wmeier@xxxxxxxxxxx):

    tshark.c: Backport 68a1b55 (with change) from Dev; Also: backport dc02627
    
     'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991.
     Change "Live captures can only be saved in libpcap format" to "[...] in pcap or pcapng format"
    
    Change-Id: I469682f24c0cc592cf4111ac8e516b5595807907
    Reviewed-on: https://code.wireshark.org/review/1961
    Reviewed-by: Bill Meier <wmeier@xxxxxxxxxxx>
    

Actions performed:

    from  451796d   Revert "tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; fixes Bug #9991."
    adds  460db8a   tshark.c: Backport 68a1b55 (with change) from Dev; Also: backport dc02627


Summary of changes:
 tshark.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)