aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
Commit message (Expand)AuthorAgeFilesLines
* EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! Ulf Lamping2005-08-241-5/+5
* Add APIs to Wiretap to return the file of the size as supplied by the OSGuy Harris2005-08-191-8/+4
* The common merge code merely needs to offer the abstraction of routinesGuy Harris2004-10-291-137/+85
* Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris2004-10-281-19/+17
* Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris2004-10-281-231/+147
* Get rid of merge_n_files() - it's only called in one place now, andGuy Harris2004-10-271-49/+0
* Change some of the merge.c APIs to return more information on failure,Guy Harris2004-10-271-44/+51
* Fix indentation.Guy Harris2004-10-271-9/+9
* From Mark C. Brown: allow the file type for the merge operation to beGuy Harris2004-10-171-2/+2
* 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-15/+11
* if more than one file is (drag and) dropped into the program,Ulf Lamping2004-06-211-12/+2
* Fix compile errors on Suse 9.1:Jörg Mayer2004-06-181-2/+2
* merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping2004-06-181-99/+80
* merge: bugfixes and code cleanupUlf Lamping2004-06-181-11/+10
* add Merge functionality to Ethereal in an experimental state.Ulf Lamping2004-06-171-0/+458
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 15:59:07 +0000