Get rid of merge_n_files() - it's only called in one place now, and
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 27 Oct 2004 23:45:10 +0000 (23:45 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 27 Oct 2004 23:45:10 +0000 (23:45 +0000)
commita3f4d1e970b6ea81496f67c7c4750da708e37cca
treeb28d0784c28eda6b511bdabc6ff147b15be12bd5
parent95062e56acfc985ffae5d1dd37a656a602fb0fca
Get rid of merge_n_files() - it's only called in one place now, and
absorbing its logic into "cf_merge_files()" simplifies things a bit.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12421 f5534014-38df-0310-8fa8-9805f1628bb7
file.c
file.h
merge.c
merge.h