| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Add boilerplate GPLv2+ license as per email response from Scott Renfro: | Jeff Morriss | 2013-01-15 | 1 | -3/+22 |
| * | We always HAVE_CONFIG_H so don't bother checking whether we have it or not. | Jeff Morriss | 2012-09-20 | 1 | -2/+0 |
| * | On a read error, always return a pointer to the merge_in_file_t for the | Guy Harris | 2012-05-25 | 1 | -3/+10 |
| * | On an I/O error, merge_read_packet() and merge_append_read_packet() need | Guy Harris | 2011-11-21 | 1 | -7/+22 |
| * | When reporting "sorry, *this* packet can't be written to a file of that | Guy Harris | 2011-11-19 | 1 | -10/+18 |
| * | Squelch some compiler warnings. | Guy Harris | 2010-03-27 | 1 | -1/+1 |
| * | Fixed a size data type. | Stig Bjørlykke | 2009-10-05 | 1 | -1/+1 |
| * | Try to fix bug 3279 (initialize a time_t to a sane value). | Gerald Combs | 2009-04-15 | 1 | -1/+1 |
| * | The first component of a "wtap_nstime" is a "time_t", which could be an | Guy Harris | 2007-12-05 | 1 | -1/+1 |
| * | EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry! | Ulf Lamping | 2005-08-24 | 1 | -5/+5 |
| * | Add APIs to Wiretap to return the file of the size as supplied by the OS | Guy Harris | 2005-08-19 | 1 | -8/+4 |
| * | The common merge code merely needs to offer the abstraction of routines | Guy Harris | 2004-10-29 | 1 | -137/+85 |
| * | Make "merge_files()" and "merge_append_files()" return a tri-state | Guy Harris | 2004-10-28 | 1 | -19/+17 |
| * | Remove all the verbose-mode code from merge.c, and put most of it in | Guy Harris | 2004-10-28 | 1 | -231/+147 |
| * | Get rid of merge_n_files() - it's only called in one place now, and | Guy Harris | 2004-10-27 | 1 | -49/+0 |
| * | Change some of the merge.c APIs to return more information on failure, | Guy Harris | 2004-10-27 | 1 | -44/+51 |
| * | Fix indentation. | Guy Harris | 2004-10-27 | 1 | -9/+9 |
| * | From Mark C. Brown: allow the file type for the merge operation to be | Guy Harris | 2004-10-17 | 1 | -2/+2 |
| * | Set the svn:eol-style property on all text files to "native", so that | Guy Harris | 2004-07-18 | 1 | -1/+1 |
| * | avoid using tmpnam() for security reasons. | Ulf Lamping | 2004-06-29 | 1 | -15/+11 |
| * | if more than one file is (drag and) dropped into the program, | Ulf Lamping | 2004-06-21 | 1 | -12/+2 |
| * | Fix compile errors on Suse 9.1: | Jörg Mayer | 2004-06-18 | 1 | -2/+2 |
| * | merge: remove code duplication in merge.c and mergecap.c (put it in merge.c), | Ulf Lamping | 2004-06-18 | 1 | -99/+80 |
| * | merge: bugfixes and code cleanup | Ulf Lamping | 2004-06-18 | 1 | -11/+10 |
| * | add Merge functionality to Ethereal in an experimental state. | Ulf Lamping | 2004-06-17 | 1 | -0/+458 |
