From Chris Hellberg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8723 :
[metze/wireshark/wip.git] / merge.c
2013-01-15 Jeff MorrissAdd boilerplate GPLv2+ license as per email response...
2012-09-20 Jeff MorrissWe always HAVE_CONFIG_H so don't bother checking whethe...
2012-05-25 Guy HarrisOn a read error, always return a pointer to the merge_i...
2011-11-21 Guy HarrisOn an I/O error, merge_read_packet() and merge_append_r...
2011-11-19 Guy HarrisWhen reporting "sorry, *this* packet can't be written...
2010-03-27 Guy HarrisSquelch some compiler warnings.
2009-10-05 Stig BjørlykkeFixed a size data type.
2009-04-15 Gerald CombsTry to fix bug 3279 (initialize a time_t to a sane...
2007-12-05 Guy HarrisThe first component of a "wtap_nstime" is a "time_t...
2005-08-24 Ulf LampingEVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry!
2005-08-19 Guy HarrisAdd APIs to Wiretap to return the file of the size...
2004-10-29 Guy HarrisThe common merge code merely needs to offer the abstrac...
2004-10-28 Guy HarrisMake "merge_files()" and "merge_append_files()" return...
2004-10-28 Guy HarrisRemove all the verbose-mode code from merge.c, and...
2004-10-27 Guy HarrisGet rid of merge_n_files() - it's only called in one...
2004-10-27 Guy HarrisChange some of the merge.c APIs to return more informat...
2004-10-27 Guy HarrisFix indentation.
2004-10-17 Guy HarrisFrom Mark C. Brown: allow the file type for the merge...
2004-07-18 Guy HarrisSet the svn:eol-style property on all text files to...
2004-06-29 Ulf Lampingavoid using tmpnam() for security reasons.
2004-06-21 Ulf Lampingif more than one file is (drag and) dropped into the...
2004-06-18 Jörg MayerFix compile errors on Suse 9.1:
2004-06-18 Ulf Lampingmerge: remove code duplication in merge.c and mergecap...
2004-06-18 Ulf Lampingmerge: bugfixes and code cleanup
2004-06-17 Ulf Lampingadd Merge functionality to Ethereal in an experimental...