Set the svn:eol-style property on all text files to "native", so that

they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400

73 files changed, 104 insertions, 104 deletions

diff --git a/wiretap/5views.c b/wiretap/5views.c
index 43b533c7e6..8e9cc877d1 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -1,6 +1,6 @@
 /* 5views.c
  *
- * $Id: 5views.c,v 1.5 2004/03/03 22:24:50 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/5views.h b/wiretap/5views.h
index 69f84f2675..bc4a9df842 100644
--- a/wiretap/5views.h
+++ b/wiretap/5views.h
@@ -1,6 +1,6 @@
 /* 5views.h
  *
- * $Id: 5views.h,v 1.2 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index fdf0a8f6dd..1c25e50d98 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Wiretap
 #
-# $Id: Makefile.am,v 1.52 2004/03/24 21:27:44 obiot Exp $
+# $Id$
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 8ad4d10ae2..98644e9ccb 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.40 2004/02/11 20:05:15 guy Exp $
+# $Id$
 #
 
 include ..\config.nmake
diff --git a/wiretap/README b/wiretap/README
index 1aa6fa0c8b..e451d6a383 100644
--- a/wiretap/README
+++ b/wiretap/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.30 2002/05/22 10:53:17 sahlberg Exp $
+$Id$
 
 Wiretap is a library that is being developed as a future replacement for
 libpcap, the current standard Unix library for packet capturing. Libpcap
diff --git a/wiretap/README.developer b/wiretap/README.developer
index 238df5f8bc..457038ff78 100644
--- a/wiretap/README.developer
+++ b/wiretap/README.developer
@@ -1,4 +1,4 @@
-$Id: README.developer,v 1.2 2003/09/24 23:53:11 guy Exp $
+$Id$
 
 This is a very quick and very dirty guide to adding support for new
 capture file formats.  If you see any errors or have any improvements,
diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4
index 054718d3ff..52f1299d1c 100644
--- a/wiretap/acinclude.m4
+++ b/wiretap/acinclude.m4
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
 dnl This file is part of the Autoconf packaging for Ethereal.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.19 2004/03/27 12:07:57 jmayer Exp $
+dnl $Id$
 dnl
 
 #
diff --git a/wiretap/airopeek9.c b/wiretap/airopeek9.c
index 7d8be7563d..7cf4f97475 100644
--- a/wiretap/airopeek9.c
+++ b/wiretap/airopeek9.c
@@ -1,7 +1,7 @@
 /* airopeek9.c
  * Routines for opening EtherPeek and AiroPeek V9 files
  *
- * $Id: airopeek9.c,v 1.12 2004/03/03 22:24:50 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/airopeek9.h b/wiretap/airopeek9.h
index f7ad4bd820..7726537d03 100644
--- a/wiretap/airopeek9.h
+++ b/wiretap/airopeek9.h
@@ -1,6 +1,6 @@
 /* airopeek9.h
  *
- * $Id: airopeek9.h,v 1.2 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend-grammar.y b/wiretap/ascend-grammar.y
index fd0e776567..323b5c497d 100644
--- a/wiretap/ascend-grammar.y
+++ b/wiretap/ascend-grammar.y
@@ -1,7 +1,7 @@
 %{
 /* ascend-grammar.y
  *
- * $Id: ascend-grammar.y,v 1.26 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index 9a506a0e0d..137984cf5f 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -2,7 +2,7 @@
  * Definitions for routines common to multiple modules in the Lucent/Ascend
  * capture file reading code code, but not used outside that code.
  *
- * $Id: ascend-int.h,v 1.11 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
diff --git a/wiretap/ascend-scanner.l b/wiretap/ascend-scanner.l
index c5b9e55d10..0f3658f6b8 100644
--- a/wiretap/ascend-scanner.l
+++ b/wiretap/ascend-scanner.l
@@ -1,7 +1,7 @@
 %{
 /* ascend-scanner.l
  *
- * $Id: ascend-scanner.l,v 1.27 2004/01/06 20:05:39 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend.c b/wiretap/ascend.c
index 0fb002c00d..73c2202b74 100644
--- a/wiretap/ascend.c
+++ b/wiretap/ascend.c
@@ -1,6 +1,6 @@
 /* ascend.c
  *
- * $Id: ascend.c,v 1.33 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ascend.h b/wiretap/ascend.h
index 4f462957fd..9e493ab36c 100644
--- a/wiretap/ascend.h
+++ b/wiretap/ascend.h
@@ -1,6 +1,6 @@
 /* ascend.h
  *
- * $Id: ascend.h,v 1.10 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/atm.c b/wiretap/atm.c
index 180cab0483..fb730b7c19 100644
--- a/wiretap/atm.c
+++ b/wiretap/atm.c
@@ -1,6 +1,6 @@
 /* atm.c
  *
- * $Id: atm.c,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/atm.h b/wiretap/atm.h
index a405130d3d..a74eb4245a 100644
--- a/wiretap/atm.h
+++ b/wiretap/atm.h
@@ -1,6 +1,6 @@
 /* atm.h
  *
- * $Id: atm.h,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index 3b1a088057..f86c6457f5 100644
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -1,6 +1,6 @@
 /* buffer.c
  *
- * $Id: buffer.c,v 1.14 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index b28eebf205..0dd47d5851 100644
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -1,6 +1,6 @@
 /* buffer.h
  *
- * $Id: buffer.h,v 1.11 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/config.h.win32 b/wiretap/config.h.win32
index 5ef85cee30..2ed6192394 100644
--- a/wiretap/config.h.win32
+++ b/wiretap/config.h.win32
@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.11 2003/11/07 23:27:13 guy Exp $ */
+/* $Id$ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
diff --git a/wiretap/configure.in b/wiretap/configure.in
index 7a5ca2b7b0..adc3141478 100644
--- a/wiretap/configure.in
+++ b/wiretap/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.58 2004/06/01 00:15:38 jmayer Exp $
+# $Id$
 #
 AC_INIT(wtap.c)
 
diff --git a/wiretap/cosine.c b/wiretap/cosine.c
index eb3bbb70cb..c17171ea69 100644
--- a/wiretap/cosine.c
+++ b/wiretap/cosine.c
@@ -1,6 +1,6 @@
 /* cosine.c
  *
- * $Id: cosine.c,v 1.10 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * CoSine IPNOS L2 debug output parsing
  * Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net>
diff --git a/wiretap/cosine.h b/wiretap/cosine.h
index db74316c9d..559ac21e2c 100644
--- a/wiretap/cosine.h
+++ b/wiretap/cosine.h
@@ -1,6 +1,6 @@
 /* cosine.h
  *
- * $Id: cosine.h,v 1.3 2004/01/25 21:55:12 guy Exp $
+ * $Id$
  *
  * CoSine IPNOS L2 debug output parsing
  * Copyright (c) 2002 by Motonori Shindo <mshindo@mshindo.net>
diff --git a/wiretap/csids.c b/wiretap/csids.c
index be747386dc..cfe1ce7a65 100644
--- a/wiretap/csids.c
+++ b/wiretap/csids.c
@@ -1,6 +1,6 @@
 /* csids.c
  *
- * $Id: csids.c,v 1.17 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2000 by Mike Hall <mlh@io.com>
  * Copyright (c) 2000 by Cisco Systems
diff --git a/wiretap/csids.h b/wiretap/csids.h
index 00fbf69ab9..ddd7cf9e60 100644
--- a/wiretap/csids.h
+++ b/wiretap/csids.h
@@ -1,6 +1,6 @@
  /* csids.h
  *
- * $Id: csids.h,v 1.4 2004/01/25 21:55:13 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2000 by Mike Hall <mlh@io.com>
  * Copyright (c) Cisco Systems
diff --git a/wiretap/dbs-etherwatch.c b/wiretap/dbs-etherwatch.c
index d247112b5e..4baff3a339 100644
--- a/wiretap/dbs-etherwatch.c
+++ b/wiretap/dbs-etherwatch.c
@@ -1,6 +1,6 @@
 /* dbs-etherwatch.c
  *
- * $Id: dbs-etherwatch.c,v 1.17 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/dbs-etherwatch.h b/wiretap/dbs-etherwatch.h
index 5a6ecb836a..ba122efd87 100644
--- a/wiretap/dbs-etherwatch.h
+++ b/wiretap/dbs-etherwatch.h
@@ -1,6 +1,6 @@
 /* dbs-etherwatch.h
  *
- * $Id: dbs-etherwatch.h,v 1.5 2004/01/25 21:55:13 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/erf.c b/wiretap/erf.c
index 777b860f2c..29715d5c07 100644
--- a/wiretap/erf.c
+++ b/wiretap/erf.c
@@ -32,7 +32,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
-* $Id: erf.c,v 1.7 2004/01/25 21:55:13 guy Exp $
+* $Id$
 */
 
 /* 
diff --git a/wiretap/erf.h b/wiretap/erf.h
index 2c1e404de1..0b99fbc80d 100644
--- a/wiretap/erf.h
+++ b/wiretap/erf.h
@@ -32,7 +32,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 *
-* $Id: erf.h,v 1.2 2004/01/25 21:55:13 guy Exp $
+* $Id$
 */
 
 #ifndef __W_ERF_H__
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c
index 18decfa48a..7967df2f90 100644
--- a/wiretap/etherpeek.c
+++ b/wiretap/etherpeek.c
@@ -3,7 +3,7 @@
  * and V7 files
  * Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net>
  *
- * $Id: etherpeek.c,v 1.29 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/etherpeek.h b/wiretap/etherpeek.h
index 7d28a0abad..02cf750df2 100644
--- a/wiretap/etherpeek.h
+++ b/wiretap/etherpeek.h
@@ -1,6 +1,6 @@
 /* etherpeek.h
  *
- * $Id: etherpeek.h,v 1.4 2004/01/25 21:55:13 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 7320d8edff..90a2ad39b6 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -1,6 +1,6 @@
 /* eyesdn.c
  *
- * $Id: eyesdn.c,v 1.8 2004/04/02 07:40:37 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/eyesdn.h b/wiretap/eyesdn.h
index 8535809c90..63b6cbaf59 100644
--- a/wiretap/eyesdn.h
+++ b/wiretap/eyesdn.h
@@ -1,6 +1,6 @@
 /* eyesdn.h
  *
- * $Id: eyesdn.h,v 1.1 2004/02/11 20:05:16 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 55bdf7429a..71a73b2e90 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -1,6 +1,6 @@
 /* file_access.c
  *
- * $Id: file_access.c,v 1.14 2004/06/30 06:58:59 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 223e55fbe8..eda7717a3c 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -1,6 +1,6 @@
 /* file_wrappers.c
  *
- * $Id: file_wrappers.c,v 1.12 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index 4950c5f59b..ef88fd0896 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -1,6 +1,6 @@
 /* file_wrappers.h
  *
- * $Id: file_wrappers.h,v 1.10 2002/08/28 20:30:44 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c
index f1d59d2774..d9c5718999 100644
--- a/wiretap/hcidump.c
+++ b/wiretap/hcidump.c
@@ -1,6 +1,6 @@
 /* hcidump.c
  *
- * $Id: hcidump.c,v 1.4 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
  *
diff --git a/wiretap/hcidump.h b/wiretap/hcidump.h
index e1d0b0c4de..fa187cba1a 100644
--- a/wiretap/hcidump.h
+++ b/wiretap/hcidump.h
@@ -1,6 +1,6 @@
 /* hcidump.h
  *
- * $Id: hcidump.h,v 1.2 2004/01/25 21:55:14 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2003 by Marcel Holtmann <marcel@holtmann.org>
  *
diff --git a/wiretap/i4b_trace.h b/wiretap/i4b_trace.h
index 1990be1c86..2e3fd636c1 100644
--- a/wiretap/i4b_trace.h
+++ b/wiretap/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.3 2002/08/28 20:30:44 jmayer Exp $
+ *	$Id$
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/wiretap/i4btrace.c b/wiretap/i4btrace.c
index 076618543e..04a9fe7f2c 100644
--- a/wiretap/i4btrace.c
+++ b/wiretap/i4btrace.c
@@ -1,6 +1,6 @@
 /* i4btrace.c
  *
- * $Id: i4btrace.c,v 1.25 2004/01/26 21:26:52 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
diff --git a/wiretap/i4btrace.h b/wiretap/i4btrace.h
index 56bbfbc7f9..6bbc32eeb5 100644
--- a/wiretap/i4btrace.h
+++ b/wiretap/i4btrace.h
@@ -1,6 +1,6 @@
 /* i4btrace.h
  *
- * $Id: i4btrace.h,v 1.4 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1999 by Bert Driehuis <driehuis@playbeing.org>
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c
index e580155a62..f427cff95b 100644
--- a/wiretap/iptrace.c
+++ b/wiretap/iptrace.c
@@ -1,6 +1,6 @@
 /* iptrace.c
  *
- * $Id: iptrace.c,v 1.50 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/iptrace.h b/wiretap/iptrace.h
index 617b7bc3ab..519917edd3 100644
--- a/wiretap/iptrace.h
+++ b/wiretap/iptrace.h
@@ -1,6 +1,6 @@
 /* iptrace.h
  *
- * $Id: iptrace.h,v 1.8 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c
index 6f8aa3d211..00679a94fb 100644
--- a/wiretap/lanalyzer.c
+++ b/wiretap/lanalyzer.c
@@ -1,6 +1,6 @@
 /* lanalyzer.c
  *
- * $Id: lanalyzer.c,v 1.48 2004/07/08 07:32:39 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/lanalyzer.h b/wiretap/lanalyzer.h
index 7f597da6db..88420d2b93 100644
--- a/wiretap/lanalyzer.h
+++ b/wiretap/lanalyzer.h
@@ -1,6 +1,6 @@
 /* lanalyzer.h
  *
- * $Id: lanalyzer.h,v 1.9 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index c8d2b93289..e58821a82a 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
 /* libpcap.c
  *
- * $Id: libpcap.c,v 1.120 2004/06/07 20:28:50 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 98a2c36f6d..f76b09bb98 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -1,6 +1,6 @@
 /* libpcap.h
  *
- * $Id: libpcap.h,v 1.15 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index b6be16ce5b..61d9e5c415 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1,6 +1,6 @@
 /* netmon.c
  *
- * $Id: netmon.c,v 1.69 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netmon.h b/wiretap/netmon.h
index d1c2659560..9310547525 100644
--- a/wiretap/netmon.h
+++ b/wiretap/netmon.h
@@ -1,6 +1,6 @@
 /* netmon.h
  *
- * $Id: netmon.h,v 1.12 2004/01/25 21:55:15 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index f8ed03ccaf..c7aa7f18a7 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -1,6 +1,6 @@
 /* nettl.c
  *
- * $Id: nettl.c,v 1.36 2004/04/02 08:27:26 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/nettl.h b/wiretap/nettl.h
index 313b97ec59..5aa5a5fad9 100644
--- a/wiretap/nettl.h
+++ b/wiretap/nettl.h
@@ -1,6 +1,6 @@
 /* nettl.h
  *
- * $Id: nettl.h,v 1.12 2004/04/02 08:27:26 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c
index ce59a85946..4244ba0427 100644
--- a/wiretap/network_instruments.c
+++ b/wiretap/network_instruments.c
@@ -1,5 +1,5 @@
 /*
- * $Id: network_instruments.c,v 1.8 2004/02/09 00:05:35 guy Exp $
+ * $Id$
  */
 
 /***************************************************************************
diff --git a/wiretap/network_instruments.h b/wiretap/network_instruments.h
index 63c6b83302..8c6a8bbb21 100644
--- a/wiretap/network_instruments.h
+++ b/wiretap/network_instruments.h
@@ -1,5 +1,5 @@
 /*
- * $Id: network_instruments.h,v 1.5 2004/01/25 21:55:16 guy Exp $
+ * $Id$
  */
 
 /***************************************************************************
diff --git a/wiretap/netxray.c b/wiretap/netxray.c
index 2f88a4845e..b623e69f8e 100644
--- a/wiretap/netxray.c
+++ b/wiretap/netxray.c
@@ -1,6 +1,6 @@
 /* netxray.c
  *
- * $Id: netxray.c,v 1.90 2004/03/03 22:24:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/netxray.h b/wiretap/netxray.h
index 0aae12380a..eeb3319672 100644
--- a/wiretap/netxray.h
+++ b/wiretap/netxray.h
@@ -1,6 +1,6 @@
 /* netxray.h
  *
- * $Id: netxray.h,v 1.12 2004/01/25 21:55:16 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index fcabc3f20e..cceab47505 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
 /* ngsniffer.c
  *
- * $Id: ngsniffer.c,v 1.113 2004/01/25 21:55:16 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/ngsniffer.h b/wiretap/ngsniffer.h
index c861e9c4e8..7260947eeb 100644
--- a/wiretap/ngsniffer.h
+++ b/wiretap/ngsniffer.h
@@ -1,6 +1,6 @@
 /* ngsniffer.h
  *
- * $Id: ngsniffer.h,v 1.13 2004/01/25 21:55:16 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/pppdump.c b/wiretap/pppdump.c
index 914460c977..2f2ec0ba45 100644
--- a/wiretap/pppdump.c
+++ b/wiretap/pppdump.c
@@ -1,6 +1,6 @@
 /* pppdump.c
  *
- * $Id: pppdump.c,v 1.25 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
diff --git a/wiretap/pppdump.h b/wiretap/pppdump.h
index 49ea0eda40..9f98a9aaca 100644
--- a/wiretap/pppdump.h
+++ b/wiretap/pppdump.h
@@ -1,6 +1,6 @@
 /* pppdump.h
  *
- * $Id: pppdump.h,v 1.4 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
diff --git a/wiretap/radcom.c b/wiretap/radcom.c
index 664fc18ba8..08524b23a3 100644
--- a/wiretap/radcom.c
+++ b/wiretap/radcom.c
@@ -1,6 +1,6 @@
 /* radcom.c
  *
- * $Id: radcom.c,v 1.46 2004/06/16 08:11:59 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/radcom.h b/wiretap/radcom.h
index a345a0f0ff..35ee182b7f 100644
--- a/wiretap/radcom.h
+++ b/wiretap/radcom.h
@@ -1,6 +1,6 @@
 /* radcom.h
  *
- * $Id: radcom.h,v 1.8 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/snoop.c b/wiretap/snoop.c
index 676f4f9d85..a19e4cd532 100644
--- a/wiretap/snoop.c
+++ b/wiretap/snoop.c
@@ -1,6 +1,6 @@
 /* snoop.c
  *
- * $Id: snoop.c,v 1.69 2004/03/03 22:24:52 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/snoop.h b/wiretap/snoop.h
index 7be282ab04..c52972ae10 100644
--- a/wiretap/snoop.h
+++ b/wiretap/snoop.h
@@ -1,6 +1,6 @@
 /* snoop.h
  *
- * $Id: snoop.h,v 1.13 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/toshiba.c b/wiretap/toshiba.c
index 315ab9649a..1c4121aab4 100644
--- a/wiretap/toshiba.c
+++ b/wiretap/toshiba.c
@@ -1,6 +1,6 @@
 /* toshiba.c
  *
- * $Id: toshiba.c,v 1.29 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/toshiba.h b/wiretap/toshiba.h
index 1dd684fb6d..314848b32b 100644
--- a/wiretap/toshiba.h
+++ b/wiretap/toshiba.h
@@ -1,6 +1,6 @@
 /* toshiba.h
  *
- * $Id: toshiba.h,v 1.6 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/visual.c b/wiretap/visual.c
index 96a13be830..5725aa9375 100644
--- a/wiretap/visual.c
+++ b/wiretap/visual.c
@@ -2,7 +2,7 @@
  * File read and write routines for Visual Networks cap files.
  * Copyright (c) 2001, Tom Nisbet  tnisbet@visualnetworks.com
  *
- * $Id: visual.c,v 1.16 2004/03/03 22:24:52 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/visual.h b/wiretap/visual.h
index 7becff9bf7..9e32791234 100644
--- a/wiretap/visual.h
+++ b/wiretap/visual.h
@@ -5,7 +5,7 @@
  *
  * Based on the code that handles netmon files.
  *
- * $Id: visual.h,v 1.6 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/vms.c b/wiretap/vms.c
index 27b88d33ad..a43b280cbc 100644
--- a/wiretap/vms.c
+++ b/wiretap/vms.c
@@ -1,6 +1,6 @@
 /* vms.c
  *
- * $Id: vms.c,v 1.23 2004/03/03 22:24:53 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/vms.h b/wiretap/vms.h
index 23cfdf3fab..66bbd68104 100644
--- a/wiretap/vms.h
+++ b/wiretap/vms.h
@@ -1,6 +1,6 @@
 /* vms.h
  *
- * $Id: vms.h,v 1.3 2004/01/25 21:55:17 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 2001 by Marc Milgram <ethereal@mmilgram.NOSPAMmail.net>
diff --git a/wiretap/wtap-capture.h b/wiretap/wtap-capture.h
index 6354bfe46c..00a947b54f 100644
--- a/wiretap/wtap-capture.h
+++ b/wiretap/wtap-capture.h
@@ -1,6 +1,6 @@
 /* wtap_capture.h
  *
- * $Id: wtap-capture.h,v 1.3 2002/08/28 20:30:45 jmayer Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h
index b98a200084..62b2859dff 100644
--- a/wiretap/wtap-int.h
+++ b/wiretap/wtap-int.h
@@ -1,6 +1,6 @@
 /* wtap-int.h
  *
- * $Id: wtap-int.h,v 1.45 2004/02/06 20:50:44 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index 3ec9d2d773..dda21fde40 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -1,6 +1,6 @@
 /* wtap.c
  *
- * $Id: wtap.c,v 1.94 2004/06/07 20:28:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
diff --git a/wiretap/wtap.def b/wiretap/wtap.def
index 2d1b803bb2..3e847a3bba 100644
--- a/wiretap/wtap.def
+++ b/wiretap/wtap.def
@@ -1,32 +1,32 @@
-EXPORTS

-wtap_buf_ptr

-wtap_close

-wtap_dump

-wtap_dump_can_open

-wtap_dump_can_write_encap

-wtap_dump_close

-wtap_dump_fdopen

-wtap_dump_file

-wtap_dump_open

-wtap_encap_short_string

-wtap_encap_string

-wtap_fd

-wtap_file_encap

-wtap_file_type

-wtap_file_type_short_string

-wtap_file_type_string

-wtap_get_bytes_dumped

-wtap_set_bytes_dumped

-wtap_loop

-wtap_open_offline

-wtap_pcap_encap_to_wtap_encap

-wtap_phdr

-wtap_process_pcap_packet

-wtap_pseudoheader

-wtap_read

-wtap_seek_read

-wtap_sequential_close

-wtap_short_string_to_encap

-wtap_short_string_to_file_type

-wtap_snapshot_length

-wtap_strerror

+EXPORTS
+wtap_buf_ptr
+wtap_close
+wtap_dump
+wtap_dump_can_open
+wtap_dump_can_write_encap
+wtap_dump_close
+wtap_dump_fdopen
+wtap_dump_file
+wtap_dump_open
+wtap_encap_short_string
+wtap_encap_string
+wtap_fd
+wtap_file_encap
+wtap_file_type
+wtap_file_type_short_string
+wtap_file_type_string
+wtap_get_bytes_dumped
+wtap_set_bytes_dumped
+wtap_loop
+wtap_open_offline
+wtap_pcap_encap_to_wtap_encap
+wtap_phdr
+wtap_process_pcap_packet
+wtap_pseudoheader
+wtap_read
+wtap_seek_read
+wtap_sequential_close
+wtap_short_string_to_encap
+wtap_short_string_to_file_type
+wtap_snapshot_length
+wtap_strerror
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 8963045c2d..2df872017c 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
 /* wtap.h
  *
- * $Id: wtap.h,v 1.155 2004/06/07 20:28:51 guy Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>