aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
Commit message (Expand)AuthorAgeFilesLines
* When reporting "sorry, *this* packet can't be written to a file of thatGuy Harris2011-11-191-6/+7
* change all file offsets from long to gint64 so we can - theoretically - handl...Ulf Lamping2006-11-051-1/+1
* name changeRonnie Sahlberg2006-05-211-2/+2
* Add APIs to Wiretap to return the file of the size as supplied by the OSGuy Harris2005-08-191-1/+1
* The common merge code merely needs to offer the abstraction of routinesGuy Harris2004-10-291-60/+29
* Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris2004-10-281-4/+15
* Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris2004-10-281-17/+8
* Get rid of merge_n_files() - it's only called in one place now, andGuy Harris2004-10-271-26/+0
* Change some of the merge.c APIs to return more information on failure,Guy Harris2004-10-271-17/+34
* From Mark C. Brown: allow the file type for the merge operation to beGuy Harris2004-10-171-1/+1
* Set the svn:eol-style property on all text files to "native", so thatGuy Harris2004-07-181-1/+1
* avoid using tmpnam() for security reasons.Ulf Lamping2004-06-291-3/+3
* if more than one file is (drag and) dropped into the program,Ulf Lamping2004-06-211-5/+5
* Fix compile errors on Suse 9.1:Jörg Mayer2004-06-181-3/+3
* merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping2004-06-181-0/+163