aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.c
Commit message (Expand)AuthorAgeFilesLines
* Try to fix some buildbot warningsMichal Labedzki2014-09-221-2/+3
* Revert "Refactor Wiretap"Guy Harris2014-05-091-14/+13
* Refactor WiretapMichael Mann2014-05-091-13/+14
* Remove all $Id$ from top of fileAlexis La Goutte2014-03-041-2/+0
* Wireshark: Add option to choose format type of capture fileMichal Labedzki2014-02-251-1/+1
* Replace wtap_nstime with nstime_t, remove wtap_nstime_to_sec.Jakub Zawadzki2013-11-091-2/+3
* Move merge.{h,c} into wiretap: these modules use wiretap to merge files.Jeff Morriss2013-07-161-0/+286