4624549a99
From Mark C. Brown: allow the file type for the merge operation to be
...
specified in the GUI.
svn path=/trunk/; revision=12326
2004-10-17 02:53:26 +00:00
8a8b883450
Set the svn:eol-style property on all text files to "native", so that
...
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-07-18 00:24:25 +00:00
19c7f04794
avoid using tmpnam() for security reasons.
...
instead of giving the merge stuff a filename,
give it an already opened file descriptor
svn path=/trunk/; revision=11273
2004-06-29 20:59:24 +00:00
5c061e582e
if more than one file is (drag and) dropped into the program,
...
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-21 16:45:07 +00:00
a3b7664597
Fix compile errors on Suse 9.1:
...
- It's gboolean not boolean
Fix warning about extraneous , at end of enum.
svn path=/trunk/; revision=11177
2004-06-18 12:04:49 +00:00
a43f7d1f88
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
...
and doing some more code cleanup
svn path=/trunk/; revision=11176
2004-06-18 10:01:59 +00:00
fa46f7a6db
merge: bugfixes and code cleanup
...
svn path=/trunk/; revision=11175
2004-06-18 07:41:21 +00:00
bd3aea8d04
add Merge functionality to Ethereal in an experimental state.
...
Copied and sligthly modified merge.c from mergecap.c
(needs a lot of code cleanup, though)
svn path=/trunk/; revision=11171
2004-06-17 21:53:26 +00:00
Guy Harris