aboutsummaryrefslogtreecommitdiffstats
path: root/.cvsignore
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-07-12 19:59:41 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-07-12 19:59:41 +0000
commitc807ef40d1c8ccdeb3b0668a6b8e3143feda8a59 (patch)
treea9c35951bce334dbad1c8c393d6cd7cd87641971 /.cvsignore
parent8b6a2060ec1e4047fe71d1e9053cf62d8c04f15c (diff)
Mergecap utility for merging capture files, from Scott Renfro.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3701 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to '.cvsignore')
-rw-r--r--.cvsignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
index 177a387fd7..c5d4f46fae 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -25,6 +25,8 @@ install-sh
libtool
ltconfig
ltmain.sh
+mergecap
+mergecap.1
missing
mkinstalldirs
packet-ncp2222.c