aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
AgeCommit message (Collapse)AuthorFilesLines
2001-07-20Get rid of some unused variables.Guy Harris1-4/+1
svn path=/trunk/; revision=3745
2001-07-14From Scott Renfro: correctly handle merging multiple files withGuy Harris1-7/+53
different encapsulation types (as best we can). svn path=/trunk/; revision=3720
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris1-140/+265
files into one capture file. svn path=/trunk/; revision=3714
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-0/+330
svn path=/trunk/; revision=3701