aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.c
AgeCommit message (Expand)AuthorFilesLines
2015-01-03Remove unnecessary includes from wiretap folderMartin Mathieson1-2/+0
2015-01-02Add "Editor modelines"; Adjust whitespace as needed.Bill Meier1-0/+13
2014-09-22Try to fix some buildbot warningsMichal Labedzki1-2/+3
2014-05-09Revert "Refactor Wiretap"Guy Harris1-14/+13
2014-05-09Refactor WiretapMichael Mann1-13/+14
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki1-1/+1
2013-11-09Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki1-2/+3
2013-07-16Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss1-0/+286