index
:
peter/wireshark
TLS13
backports-1.12-ssl
bug/3444
cleanup_routine
interval-tree-point-insert
master
master-1.12
master-2.0
master-2.2
master-2.4
proto-alot
proto-coc
reassembly-fixes
ssl-aead-fixes
ssl-handshake-reassembly
starttls-fixes
x509-subjectpublickey
Wireshark source repository for Peter
Peter Wu
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
merge.c
Age
Commit message (
Expand
)
Author
Files
Lines
2007-12-05
The first component of a "wtap_nstime" is a "time_t", which could be an
Guy Harris
1
-1
/
+1
2005-08-24
EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry!
Ulf Lamping
1
-5
/
+5
2005-08-19
Add APIs to Wiretap to return the file of the size as supplied by the OS
Guy Harris
1
-8
/
+4
2004-10-29
The common merge code merely needs to offer the abstraction of routines
Guy Harris
1
-137
/
+85
2004-10-28
Make "merge_files()" and "merge_append_files()" return a tri-state
Guy Harris
1
-19
/
+17
2004-10-28
Remove all the verbose-mode code from merge.c, and put most of it in
Guy Harris
1
-231
/
+147
2004-10-27
Get rid of merge_n_files() - it's only called in one place now, and
Guy Harris
1
-49
/
+0
2004-10-27
Change some of the merge.c APIs to return more information on failure,
Guy Harris
1
-44
/
+51
2004-10-27
Fix indentation.
Guy Harris
1
-9
/
+9
2004-10-17
From Mark C. Brown: allow the file type for the merge operation to be
Guy Harris
1
-2
/
+2
2004-07-18
Set the svn:eol-style property on all text files to "native", so that
Guy Harris
1
-1
/
+1
2004-06-29
avoid using tmpnam() for security reasons.
Ulf Lamping
1
-15
/
+11
2004-06-21
if more than one file is (drag and) dropped into the program,
Ulf Lamping
1
-12
/
+2
2004-06-18
Fix compile errors on Suse 9.1:
Jörg Mayer
1
-2
/
+2
2004-06-18
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
Ulf Lamping
1
-99
/
+80
2004-06-18
merge: bugfixes and code cleanup
Ulf Lamping
1
-11
/
+10
2004-06-17
add Merge functionality to Ethereal in an experimental state.
Ulf Lamping
1
-0
/
+458