merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 18 Jun 2004 10:01:59 +0000 (10:01 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 18 Jun 2004 10:01:59 +0000 (10:01 +0000)
commit27a28bca2351b290bf612a7d93984b6ee69f8060
treec7462e463a211355f06450bab8748eaf738fa869
parentfdc11b5f22d581faeda2350210203ba879ec1401
merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
and doing some more code cleanup

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11176 f5534014-38df-0310-8fa8-9805f1628bb7
Makefile.common
merge.c
merge.h [new file with mode: 0644]
mergecap.c