More constification of arrays.

[obnox/wireshark/wip.git] / merge.c

diff --git a/merge.c b/merge.c
index 33a12e163732c5269c6a06646f732194c2928b05..ac460500429975c098f6bd46c7a18d9f549b8cc2 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,6 @@
 /* Combine two dump files, either by appending or by merging by timestamp
  *
- * $Id: merge.c,v 1.6 2004/06/29 20:59:23 ulfl Exp $
+ * $Id$
  *
  * Written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris