aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.h
AgeCommit message (Expand)AuthorFilesLines
2016-02-11Make file indices consistently unsigned in the merge code.Guy Harris1-1/+1
2015-11-11Make routines used only within wiretap/merge.c static.Guy Harris1-71/+0
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan1-3/+100
2015-08-14Ident the merge.c/h files by 4 spacesHadriel Kaplan1-12/+12
2014-05-09Revert "Refactor Wiretap"Guy Harris1-1/+1
2014-05-09Refactor WiretapMichael Mann1-1/+1
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-0/+130