path: root/doc/mergecap.pod
AgeCommit message (Expand)AuthorFilesLines
2018-12-07PCAP/PCAPNG: Be consistent in documentation, etcJaap Keuter1-6/+6
2018-08-18Docs: Make our Pod documentation encoding uniform.Gerald Combs1-0/+5
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-17/+23
2014-09-17Update the doc directory to use https://www.wireshark.org.Gerald Combs1-3/+3
2014-06-21Add command-line argument to request the version to a number of the utilities.Jeff Morriss1-0/+5
2013-07-28If a core Wireshark developer repeatedly can't remember that theGuy Harris1-3/+3
2013-05-20If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.Chris Maynard1-1/+1
2012-03-15Sort the options.Chris Maynard1-9/+9
2012-02-03The libpcap puts pcap-filter into the misc section (which seems to be 7).Jörg Mayer1-2/+2
2011-11-30Hopefully clarify usage a bit to indicate multiple infile's can be specified ...Chris Maynard1-12/+11
2010-02-18Fix a warning from pod2man.Guy Harris1-2/+0
2010-02-17Add an option to capinfos to print start and end times as seconds, whichGerald Combs1-0/+15
2009-05-12SYNOPSYS --> SYNOPSISBill Meier1-1/+1
2009-05-12Update man pages; Add several missing options; Fix typos, Do minor rewording; Bill Meier1-4/+4
2006-08-10Add some programs to 'see also'Jörg Mayer1-1/+2
2006-07-10Remove the numeric component in man page links.Gerald Combs1-1/+1
2006-07-09Use L<> on all links.Guy Harris1-7/+8
2006-05-31Rename the main executable to "wireshark", along with more conversions:Gerald Combs1-8/+8
2006-05-22ethereal->wiresharkRonnie Sahlberg1-1/+1
2006-01-11instead of repeating the capture file format description over and over again ...Ulf Lamping1-98/+16
2006-01-10same command line related changes as recently done with editcapUlf Lamping1-97/+104
2005-01-18we can merge more than two files with mergecapUlf Lamping1-1/+1
2004-04-25build a list of the input file formats instead of a floating text,Ulf Lamping1-20/+89
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer1-2/+3
2004-02-11Include EyeSDN USB S0 trace files in the list of file formats we read.Guy Harris1-6/+6
2003-12-18WildPackets' EtherHelp appears to write EtherPeek-compatible files,Guy Harris1-4/+4
2003-10-31Fix some warnings from pod2man.Guy Harris1-2/+2
2003-10-31From Scott Emberley: support for reading Network Instruments version 9Guy Harris1-17/+20
2003-07-29From Thierry Martin: support for reading files from Accellent 5Views LANGuy Harris1-6/+7
2003-05-20Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.Guy Harris1-9/+9
2003-05-19From Martin Warnes: support for VMS UCX$TRACE output in wiretap.Guy Harris1-8/+9
2003-03-10Obscure more email addresses.Gerald Combs1-2/+2
2002-07-31From Motonori Shindo: support for reading CoSine L2 debug output.Guy Harris1-7/+7
2002-03-26From Andrew Feren:Guy Harris1-1/+1
2002-01-29Untested support for AiroPeek captures.Guy Harris1-12/+13
2002-01-22Fix up various product names and descriptions in the lists of fileGuy Harris1-16/+17
2002-01-18It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.Guy Harris1-1/+1
2001-12-05The Visual Networks tool that generates capture files that we now canGuy Harris1-1/+1
2001-12-05Note that Ethereal's and Tethereal's native capture file format isGuy Harris1-13/+15
2001-12-04Update the manual pages to reflect the addition of support for readingGuy Harris1-8/+10
2001-10-19DBS Etherwatch wiretap module, from Marc Milgram.Guy Harris1-7/+7
2001-10-18VMS TCPIPtrace wiretap module, from Marc Milgram.Guy Harris1-4/+7
2001-07-14From Scott Renfro: correctly handle merging multiple files withGuy Harris1-6/+11
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris1-22/+26
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-0/+127