aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
AgeCommit message (Collapse)AuthorFilesLines
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-15/+11
instead of giving the merge stuff a filename, give it an already opened file descriptor svn path=/trunk/; revision=11273
2004-06-21if more than one file is (drag and) dropped into the program,Ulf Lamping1-12/+2
merge them together into a new temporary file (and notice the user by a simple_dialog about it) svn path=/trunk/; revision=11205
2004-06-18Fix compile errors on Suse 9.1:Jörg Mayer1-2/+2
- It's gboolean not boolean Fix warning about extraneous , at end of enum. svn path=/trunk/; revision=11177
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-99/+80
and doing some more code cleanup svn path=/trunk/; revision=11176
2004-06-18merge: bugfixes and code cleanupUlf Lamping1-11/+10
svn path=/trunk/; revision=11175
2004-06-17add Merge functionality to Ethereal in an experimental state.Ulf Lamping1-0/+458
Copied and sligthly modified merge.c from mergecap.c (needs a lot of code cleanup, though) svn path=/trunk/; revision=11171