aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mergecap.pod
AgeCommit message (Expand)AuthorFilesLines
2011-11-30Hopefully clarify usage a bit to indicate multiple infile's can be specified ...cmaynard1-12/+11
2010-02-18Fix a warning from pod2man.guy1-2/+0
2010-02-17Add an option to capinfos to print start and end times as seconds, whichgerald1-0/+15
2009-05-12SYNOPSYS --> SYNOPSISwmeier1-1/+1
2009-05-12Update man pages; Add several missing options; Fix typos, Do minor rewording; wmeier1-4/+4
2006-08-10Add some programs to 'see also'jmayer1-1/+2
2006-07-10Remove the numeric component in man page links.gerald1-1/+1
2006-07-09Use L<> on all links.guy1-7/+8
2006-05-31Rename the main executable to "wireshark", along with more conversions:gerald1-8/+8
2006-05-22ethereal->wiresharksahlberg1-1/+1
2006-01-11instead of repeating the capture file format description over and over again ...ulfl1-98/+16
2006-01-10same command line related changes as recently done with editcapulfl1-97/+104
2005-01-18we can merge more than two files with mergecapulfl1-1/+1
2004-04-25build a list of the input file formats instead of a floating text,ulfl1-20/+89
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -jmayer1-2/+3
2004-02-11Include EyeSDN USB S0 trace files in the list of file formats we read.guy1-6/+6
2003-12-18WildPackets' EtherHelp appears to write EtherPeek-compatible files,guy1-4/+4
2003-10-31Fix some warnings from pod2man.guy1-2/+2
2003-10-31From Scott Emberley: support for reading Network Instruments version 9guy1-17/+20
2003-07-29From Thierry Martin: support for reading files from Accellent 5Views LANguy1-6/+7
2003-05-20Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.guy1-9/+9
2003-05-19From Martin Warnes: support for VMS UCX$TRACE output in wiretap.guy1-8/+9
2003-03-10Obscure more email addresses.gerald1-2/+2
2002-07-31From Motonori Shindo: support for reading CoSine L2 debug output.guy1-7/+7
2002-03-26From Andrew Feren:guy1-1/+1
2002-01-29Untested support for AiroPeek captures.guy1-12/+13
2002-01-22Fix up various product names and descriptions in the lists of fileguy1-16/+17
2002-01-18It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.guy1-1/+1
2001-12-05The Visual Networks tool that generates capture files that we now canguy1-1/+1
2001-12-05Note that Ethereal's and Tethereal's native capture file format isguy1-13/+15
2001-12-04Update the manual pages to reflect the addition of support for readingguy1-8/+10
2001-10-19DBS Etherwatch wiretap module, from Marc Milgram.guy1-7/+7
2001-10-18VMS TCPIPtrace wiretap module, from Marc Milgram.guy1-4/+7
2001-07-14From Scott Renfro: correctly handle merging multiple files withguy1-6/+11
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureguy1-22/+26
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.guy1-0/+127