index
:
wireshark
daniel/osmux
fixeria/ipa
laforge/amr-2023
laforge/doc-fixes
laforge/pending
laforge/qcdiag
laforge/rspro
master
mobis
mobis_new
more-patches
osmith/deb-packaging
osmith/wip
osmocom/master
osmocom/qcdiag
pespin/amr
pespin/csn1
pespin/gsup
pespin/iuup-extended
pespin/osmux-stats
pespin/osmux-wip
pespin/racap
pespin/racap-tmp
pespin/rlcmac
sylvain/gmr
sylvain/gmr1
thomas/dect
wireshark.org protocol dissector with Osmocom additions (obsolete)
Harald Welte
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
doc
/
mergecap.pod
Age
Commit message (
Expand
)
Author
Files
Lines
2006-08-10
Add some programs to 'see also'
Jörg Mayer
1
-1
/
+2
2006-07-10
Remove the numeric component in man page links.
Gerald Combs
1
-1
/
+1
2006-07-09
Use L<> on all links.
Guy Harris
1
-7
/
+8
2006-05-31
Rename the main executable to "wireshark", along with more conversions:
Gerald Combs
1
-8
/
+8
2006-05-22
ethereal->wireshark
Ronnie Sahlberg
1
-1
/
+1
2006-01-11
instead of repeating the capture file format description over and over again ...
Ulf Lamping
1
-98
/
+16
2006-01-10
same command line related changes as recently done with editcap
Ulf Lamping
1
-97
/
+104
2005-01-18
we can merge more than two files with mergecap
Ulf Lamping
1
-1
/
+1
2004-04-25
build a list of the input file formats instead of a floating text,
Ulf Lamping
1
-20
/
+89
2004-03-03
Bill Guyton: mergecap can write to stdout by using the special filename -
Jörg Mayer
1
-2
/
+3
2004-02-11
Include EyeSDN USB S0 trace files in the list of file formats we read.
Guy Harris
1
-6
/
+6
2003-12-18
WildPackets' EtherHelp appears to write EtherPeek-compatible files,
Guy Harris
1
-4
/
+4
2003-10-31
Fix some warnings from pod2man.
Guy Harris
1
-2
/
+2
2003-10-31
From Scott Emberley: support for reading Network Instruments version 9
Guy Harris
1
-17
/
+20
2003-07-29
From Thierry Martin: support for reading files from Accellent 5Views LAN
Guy Harris
1
-6
/
+7
2003-05-20
Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.
Guy Harris
1
-9
/
+9
2003-05-19
From Martin Warnes: support for VMS UCX$TRACE output in wiretap.
Guy Harris
1
-8
/
+9
2003-03-10
Obscure more email addresses.
Gerald Combs
1
-2
/
+2
2002-07-31
From Motonori Shindo: support for reading CoSine L2 debug output.
Guy Harris
1
-7
/
+7
2002-03-26
From Andrew Feren:
Guy Harris
1
-1
/
+1
2002-01-29
Untested support for AiroPeek captures.
Guy Harris
1
-12
/
+13
2002-01-22
Fix up various product names and descriptions in the lists of file
Guy Harris
1
-16
/
+17
2002-01-18
It's EtherPeek, not Etherpeek, as WildPackets' Web site indicates.
Guy Harris
1
-1
/
+1
2001-12-05
The Visual Networks tool that generates capture files that we now can
Guy Harris
1
-1
/
+1
2001-12-05
Note that Ethereal's and Tethereal's native capture file format is
Guy Harris
1
-13
/
+15
2001-12-04
Update the manual pages to reflect the addition of support for reading
Guy Harris
1
-8
/
+10
2001-10-19
DBS Etherwatch wiretap module, from Marc Milgram.
Guy Harris
1
-7
/
+7
2001-10-18
VMS TCPIPtrace wiretap module, from Marc Milgram.
Guy Harris
1
-4
/
+7
2001-07-14
From Scott Renfro: correctly handle merging multiple files with
Guy Harris
1
-6
/
+11
2001-07-13
Update from Scott Renfro to allow mergecap to merge multiple capture
Guy Harris
1
-22
/
+26
2001-07-12
Mergecap utility for merging capture files, from Scott Renfro.
Guy Harris
1
-0
/
+127