index
:
tools/wireshark
Novell_NCP_branch
cherry-pick-112af30d
cherry-pick-78067deb-2
cherry-pick-c6e60da6-2
ethereal
lts-1.12.1
lts-1.2.11
lts-1.8.2
master
master-1.0
master-1.10
master-1.12
master-1.2
master-1.4
master-1.6
master-1.8
master-2.0
master-2.2
master-2.4
master-2.6
master-3.0
master-3.2
old-trunk-1.0
release-3.4
release-3.6
win32-native
WIP Patches to add a samsung-ipc dissector to Wireshark
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge.h
Commit message (
Expand
)
Author
Age
Files
Lines
*
When reporting "sorry, *this* packet can't be written to a file of that
Guy Harris
2011-11-19
1
-6
/
+7
*
change all file offsets from long to gint64 so we can - theoretically - handl...
Ulf Lamping
2006-11-05
1
-1
/
+1
*
name change
Ronnie Sahlberg
2006-05-21
1
-2
/
+2
*
Add APIs to Wiretap to return the file of the size as supplied by the OS
Guy Harris
2005-08-19
1
-1
/
+1
*
The common merge code merely needs to offer the abstraction of routines
Guy Harris
2004-10-29
1
-60
/
+29
*
Make "merge_files()" and "merge_append_files()" return a tri-state
Guy Harris
2004-10-28
1
-4
/
+15
*
Remove all the verbose-mode code from merge.c, and put most of it in
Guy Harris
2004-10-28
1
-17
/
+8
*
Get rid of merge_n_files() - it's only called in one place now, and
Guy Harris
2004-10-27
1
-26
/
+0
*
Change some of the merge.c APIs to return more information on failure,
Guy Harris
2004-10-27
1
-17
/
+34
*
From Mark C. Brown: allow the file type for the merge operation to be
Guy Harris
2004-10-17
1
-1
/
+1
*
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
-3
/
+3
*
if more than one file is (drag and) dropped into the program,
Ulf Lamping
2004-06-21
1
-5
/
+5
*
Fix compile errors on Suse 9.1:
Jörg Mayer
2004-06-18
1
-3
/
+3
*
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
Ulf Lamping
2004-06-18
1
-0
/
+163