index
:
wireshark
daniel/osmux
fixeria/ipa
laforge/amr-2023
laforge/doc-fixes
laforge/pending
laforge/qcdiag
laforge/rspro
master
mobis
mobis_new
more-patches
osmith/deb-packaging
osmith/wip
osmocom/master
osmocom/qcdiag
pespin/amr
pespin/csn1
pespin/gsup
pespin/iuup-extended
pespin/osmux-stats
pespin/osmux-wip
pespin/racap
pespin/racap-tmp
pespin/rlcmac
sylvain/gmr
sylvain/gmr1
thomas/dect
wireshark.org protocol dissector with Osmocom additions (obsolete)
Harald Welte
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge.h
Age
Commit message (
Expand
)
Author
Files
Lines
2004-10-29
The common merge code merely needs to offer the abstraction of routines
Guy Harris
1
-60
/
+29
2004-10-28
Make "merge_files()" and "merge_append_files()" return a tri-state
Guy Harris
1
-4
/
+15
2004-10-28
Remove all the verbose-mode code from merge.c, and put most of it in
Guy Harris
1
-17
/
+8
2004-10-27
Get rid of merge_n_files() - it's only called in one place now, and
Guy Harris
1
-26
/
+0
2004-10-27
Change some of the merge.c APIs to return more information on failure,
Guy Harris
1
-17
/
+34
2004-10-17
From Mark C. Brown: allow the file type for the merge operation to be
Guy Harris
1
-1
/
+1
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
-3
/
+3
2004-06-21
if more than one file is (drag and) dropped into the program,
Ulf Lamping
1
-5
/
+5
2004-06-18
Fix compile errors on Suse 9.1:
Jörg Mayer
1
-3
/
+3
2004-06-18
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
Ulf Lamping
1
-0
/
+163