18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

8 files changed, 8 insertions, 8 deletions

diff --git a/src/XECallBcks.c b/src/XECallBcks.c
index e04f1e4..fb1e089 100644
--- a/src/XECallBcks.c
+++ b/src/XECallBcks.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XECallBcks.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
diff --git a/src/XEConTxt.c b/src/XEConTxt.c
index 28498c3..7da9689 100644
--- a/src/XEConTxt.c
+++ b/src/XEConTxt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XEConTxt.c,v 1.2 2001/11/19 15:33:39 tsi Exp $ */
+/* $XFree86: xc/lib/XTrap/XEConTxt.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
 Maynard, MA
diff --git a/src/XEDsptch.c b/src/XEDsptch.c
index 858df22..b503926 100644
--- a/src/XEDsptch.c
+++ b/src/XEDsptch.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XEDsptch.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
diff --git a/src/XEPrInfo.c b/src/XEPrInfo.c
index 5829e2e..908ca3a 100644
--- a/src/XEPrInfo.c
+++ b/src/XEPrInfo.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XEPrInfo.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
 Maynard, MA
diff --git a/src/XERqsts.c b/src/XERqsts.c
index 02f0c97..dbecea3 100644
--- a/src/XERqsts.c
+++ b/src/XERqsts.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XERqsts.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
 
diff --git a/src/XEStrMap.c b/src/XEStrMap.c
index 411fce9..2a97f13 100644
--- a/src/XEStrMap.c
+++ b/src/XEStrMap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XEStrMap.c,v 1.2 2001/11/08 04:00:12 tsi Exp $ */
+/* $XFree86: xc/lib/XTrap/XEStrMap.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp., 
 Maynard, MA
diff --git a/src/XETrapInit.c b/src/XETrapInit.c
index 3a76d0e..a4a0431 100644
--- a/src/XETrapInit.c
+++ b/src/XETrapInit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XETrapInit.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */
+/* $XFree86: xc/lib/XTrap/XETrapInit.c,v 1.2 2001/11/08 04:00:12 tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1992 by Digital Equipment Corp., 
 Maynard, MA
diff --git a/src/XEWrappers.c b/src/XEWrappers.c
index b857c75..c3bd16f 100644
--- a/src/XEWrappers.c
+++ b/src/XEWrappers.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/XTrap/XEWrappers.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */
+/* $XFree86$ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp., 
 Maynard, MA