path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
2005-08-24EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! Ulf Lamping1-5/+5
2005-08-19Add APIs to Wiretap to return the file of the size as supplied by the OSGuy Harris1-8/+4
2004-10-29The common merge code merely needs to offer the abstraction of routinesGuy Harris1-137/+85
2004-10-28Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris1-19/+17
2004-10-28Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris1-231/+147
2004-10-27Get rid of merge_n_files() - it's only called in one place now, andGuy Harris1-49/+0
2004-10-27Change some of the merge.c APIs to return more information on failure,Guy Harris1-44/+51
2004-10-27Fix indentation.Guy Harris1-9/+9
2004-10-17From Mark C. Brown: allow the file type for the merge operation to beGuy Harris1-2/+2
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-15/+11
2004-06-21if more than one file is (drag and) dropped into the program,Ulf Lamping1-12/+2
2004-06-18Fix compile errors on Suse 9.1:Jörg Mayer1-2/+2
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-99/+80
2004-06-18merge: bugfixes and code cleanupUlf Lamping1-11/+10
2004-06-17add Merge functionality to Ethereal in an experimental state.Ulf Lamping1-0/+458