aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
AgeCommit message (Expand)AuthorFilesLines
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