git.samba.org / metze / wireshark / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b48b884) | patch
Get rid of merge_n_files() - it's only called in one place now, and
authorGuy Harris <guy@alum.mit.edu>
Wed, 27 Oct 2004 23:45:10 +0000 (23:45 -0000)
committerGuy Harris <guy@alum.mit.edu>
Wed, 27 Oct 2004 23:45:10 +0000 (23:45 -0000)
commitd9bdadc4dd3d4dbaf7581b7ffd21773232003936
treeb28d0784c28eda6b511bdabc6ff147b15be12bd5tree
parentb48b8847b1ac3289656224831f86a5d235202455commit | diff
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.

svn path=/trunk/; revision=12421
file.c diff | blob | history
file.h diff | blob | history
merge.c diff | blob | history
merge.h diff | blob | history
Unnamed repository; edit this file to name it for gitweb.