aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
Commit message (Expand)AuthorAgeFilesLines
* If a core Wireshark developer repeatedly can't remember that theGuy Harris2013-07-281-3/+3
* If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.Chris Maynard2013-05-201-1/+1
* Sort the options.Chris Maynard2012-03-151-9/+9
* The libpcap puts pcap-filter into the misc section (which seems to be 7).Jörg Mayer2012-02-031-2/+2
* Hopefully clarify usage a bit to indicate multiple infile's can be specified ...Chris Maynard2011-11-301-12/+11
* Fix a warning from pod2man.Guy Harris2010-02-181-2/+0
* Add an option to capinfos to print start and end times as seconds, whichGerald Combs2010-02-171-0/+15
* SYNOPSYS --> SYNOPSISBill Meier2009-05-121-1/+1
* Update man pages; Add several missing options; Fix typos, Do minor rewording; Bill Meier2009-05-121-4/+4
* Add some programs to 'see also'Jörg Mayer2006-08-101-1/+2
* Remove the numeric component in man page links.Gerald Combs2006-07-101-1/+1
* Use L<> on all links.Guy Harris2006-07-091-7/+8
* Rename the main executable to "wireshark", along with more conversions:Gerald Combs2006-05-311-8/+8
* ethereal->wiresharkRonnie Sahlberg2006-05-221-1/+1
* instead of repeating the capture file format description over and over again ...Ulf Lamping2006-01-111-98/+16
* same command line related changes as recently done with editcapUlf Lamping2006-01-101-97/+104
* we can merge more than two files with mergecapUlf Lamping2005-01-181-1/+1
* build a list of the input file formats instead of a floating text,Ulf Lamping2004-04-251-20/+89
* Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer2004-03-031-2/+3
* Include EyeSDN USB S0 trace files in the list of file formats we read.Guy Harris2004-02-111-6/+6
* WildPackets' EtherHelp appears to write EtherPeek-compatible files,Guy Harris2003-12-181-4/+4
* Fix some warnings from pod2man.Guy Harris2003-10-311-2/+2
* From Scott Emberley: support for reading Network Instruments version 9Guy Harris2003-10-311-17/+20
* From Thierry Martin: support for reading files from Accellent 5Views LANGuy Harris2003-07-291-6/+7
* Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.Guy Harris2003-05-201-9/+9
* From Martin Warnes: support for VMS UCX$TRACE output in wiretap.Guy Harris2003-05-191-8/+9
* Obscure more email addresses.Gerald Combs2003-03-101-2/+2
* From Motonori Shindo: support for reading CoSine L2 debug output.Guy Harris2002-07-311-7/+7
* From Andrew Feren:Guy Harris2002-03-261-1/+1
* Untested support for AiroPeek captures.Guy Harris2002-01-291-12/+13
* Fix up various product names and descriptions in the lists of fileGuy Harris2002-01-221-16/+17
* It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.Guy Harris2002-01-181-1/+1
* The Visual Networks tool that generates capture files that we now canGuy Harris2001-12-051-1/+1
* Note that Ethereal's and Tethereal's native capture file format isGuy Harris2001-12-051-13/+15
* Update the manual pages to reflect the addition of support for readingGuy Harris2001-12-041-8/+10
* DBS Etherwatch wiretap module, from Marc Milgram.Guy Harris2001-10-191-7/+7
* VMS TCPIPtrace wiretap module, from Marc Milgram.Guy Harris2001-10-181-4/+7
* From Scott Renfro: correctly handle merging multiple files withGuy Harris2001-07-141-6/+11
* Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris2001-07-131-22/+26
* Mergecap utility for merging capture files, from Scott Renfro.Guy Harris2001-07-121-0/+127