Ethereal-dev: Re: [Ethereal-dev] New utility: mergecap

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date Index Thread Index Other Months All Mailing Lists
Date Prev Date Next Thread Prev Thread Next
From: Guy Harris <guy@xxxxxxxxxx>
Date: Thu, 12 Jul 2001 13:01:23 -0700 (PDT)
> The attached patch adds a new utility called mergecap.

Checked in.

I also modified the top-level ".cvsignore" file to ignore "mergecap" and
"mergecap.1" (so that "cvs diff" doesn't report them as with question
marks in front of their names)...

> I haven't tested it yet on win32, but if editcap works fine
> on win32, mergecap *should* as well. ;-)

...and changed "image/Makefile.nmake" to turn "mergecap.rc.in" into
"mergecap.rc" (i.e., that was being done for editcap.rc.in, but not
mergecap.rc.in).