aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
AgeCommit message (Expand)AuthorFilesLines
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