Import of XFree86 4.0.1d-pre (2)X_4_0_1d-pre

23 files changed, 23 insertions, 23 deletions

diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile
index 62e10d50d..ef79b9407 100644
--- a/xc/programs/Xserver/dix/Imakefile
+++ b/xc/programs/Xserver/dix/Imakefile
@@ -1,5 +1,5 @@
 XCOMM $XConsortium: Imakefile /main/52 1996/12/02 10:20:03 lehors $
-XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.9 1999/04/17 09:08:28 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.10 1999/09/27 06:29:17 dawes Exp $
 #include <Server.tmpl>
 
 #if PrintOnlyServer
diff --git a/xc/programs/Xserver/dix/atom.c b/xc/programs/Xserver/dix/atom.c
index 562f193ef..b6dfc2ebb 100644
--- a/xc/programs/Xserver/dix/atom.c
+++ b/xc/programs/Xserver/dix/atom.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.0 1996/04/15 11:19:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/atom.c,v 3.1 1998/10/04 09:38:01 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/colormap.c b/xc/programs/Xserver/dix/colormap.c
index 2bc3ee3c1..f68c9044e 100644
--- a/xc/programs/Xserver/dix/colormap.c
+++ b/xc/programs/Xserver/dix/colormap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.2 1997/11/16 06:17:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.4 2000/01/22 01:59:55 mvojkovi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/cursor.c b/xc/programs/Xserver/dix/cursor.c
index 265307197..23a9fcb3d 100644
--- a/xc/programs/Xserver/dix/cursor.c
+++ b/xc/programs/Xserver/dix/cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.2 1998/09/13 05:45:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/cursor.c,v 3.3 1998/10/04 09:38:02 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/devices.c b/xc/programs/Xserver/dix/devices.c
index 093691af5..4723e2e0d 100644
--- a/xc/programs/Xserver/dix/devices.c
+++ b/xc/programs/Xserver/dix/devices.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.14 1999/01/13 08:30:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.15 1999/05/16 06:55:40 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/dispatch.c b/xc/programs/Xserver/dix/dispatch.c
index a8a3ce410..ef25f42a2 100644
--- a/xc/programs/Xserver/dix/dispatch.c
+++ b/xc/programs/Xserver/dix/dispatch.c
@@ -64,7 +64,7 @@ SOFTWARE.
 *                                                               *
 *****************************************************************/
 
-/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.21 2000/09/22 05:57:18 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.22 2000/09/22 06:21:18 keithp Exp $ */
 
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
diff --git a/xc/programs/Xserver/dix/dispatch.h b/xc/programs/Xserver/dix/dispatch.h
index d9bcddf72..48b287b2b 100644
--- a/xc/programs/Xserver/dix/dispatch.h
+++ b/xc/programs/Xserver/dix/dispatch.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.0 1996/04/15 11:19:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.1 1996/05/06 05:56:15 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/xc/programs/Xserver/dix/dixfonts.c b/xc/programs/Xserver/dix/dixfonts.c
index 43270f7b4..f780bc07b 100644
--- a/xc/programs/Xserver/dix/dixfonts.c
+++ b/xc/programs/Xserver/dix/dixfonts.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.22 2000/02/08 17:18:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.23 2000/04/04 19:24:47 dawes Exp $ */
 /************************************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
diff --git a/xc/programs/Xserver/dix/dixutils.c b/xc/programs/Xserver/dix/dixutils.c
index 42e564d3c..21044c255 100644
--- a/xc/programs/Xserver/dix/dixutils.c
+++ b/xc/programs/Xserver/dix/dixutils.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.4 1999/01/13 08:30:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.5 1999/10/13 22:32:48 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/events.c b/xc/programs/Xserver/dix/events.c
index 5283ea753..5b5c264ff 100644
--- a/xc/programs/Xserver/dix/events.c
+++ b/xc/programs/Xserver/dix/events.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.33 2000/03/26 21:47:29 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.34 2000/05/05 17:53:48 keithp Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/extension.c b/xc/programs/Xserver/dix/extension.c
index 6eb06858e..ca1608431 100644
--- a/xc/programs/Xserver/dix/extension.c
+++ b/xc/programs/Xserver/dix/extension.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.7 1999/01/13 08:30:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.8 2000/01/29 17:16:54 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/gc.c b/xc/programs/Xserver/dix/gc.c
index ee598859b..c3a8bc398 100644
--- a/xc/programs/Xserver/dix/gc.c
+++ b/xc/programs/Xserver/dix/gc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.4 1996/12/23 06:29:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/gc.c,v 3.5 1998/10/04 09:38:08 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/globals.c b/xc/programs/Xserver/dix/globals.c
index 2c3d72098..7e9cfc3b1 100644
--- a/xc/programs/Xserver/dix/globals.c
+++ b/xc/programs/Xserver/dix/globals.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.6 1998/10/04 09:38:09 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.7 1999/09/25 14:36:51 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/grabs.c b/xc/programs/Xserver/dix/grabs.c
index c4f1c794d..307f6ee7f 100644
--- a/xc/programs/Xserver/dix/grabs.c
+++ b/xc/programs/Xserver/dix/grabs.c
@@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.0 1996/04/15 11:19:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.1 1998/10/04 09:38:09 dawes Exp $ */
 
 #include "X.h"
 #include "misc.h"
diff --git a/xc/programs/Xserver/dix/main.c b/xc/programs/Xserver/dix/main.c
index ecede1e01..f212cfd9b 100644
--- a/xc/programs/Xserver/dix/main.c
+++ b/xc/programs/Xserver/dix/main.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.28 2000/02/12 03:39:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.29 2000/06/16 01:50:19 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/pixmap.c b/xc/programs/Xserver/dix/pixmap.c
index 66277d985..424220617 100644
--- a/xc/programs/Xserver/dix/pixmap.c
+++ b/xc/programs/Xserver/dix/pixmap.c
@@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.2 1998/07/25 09:24:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.3 1998/10/04 09:38:10 dawes Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/xc/programs/Xserver/dix/privates.c b/xc/programs/Xserver/dix/privates.c
index f2fafff70..d5e2fd6a1 100644
--- a/xc/programs/Xserver/dix/privates.c
+++ b/xc/programs/Xserver/dix/privates.c
@@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.5 1998/10/04 09:38:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.6 1999/12/30 02:37:06 robin Exp $ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/xc/programs/Xserver/dix/property.c b/xc/programs/Xserver/dix/property.c
index 05e71f7a2..9dbe5bc89 100644
--- a/xc/programs/Xserver/dix/property.c
+++ b/xc/programs/Xserver/dix/property.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.6 1998/10/04 09:38:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.7 1999/01/13 08:30:54 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/resource.c b/xc/programs/Xserver/dix/resource.c
index d3a1fab71..6570ecb65 100644
--- a/xc/programs/Xserver/dix/resource.c
+++ b/xc/programs/Xserver/dix/resource.c
@@ -88,7 +88,7 @@ SOFTWARE.
  *      1, and an otherwise arbitrary ID in the low 22 bits, we can create a
  *      resource "owned" by the client.
  */
-/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.5 1999/01/26 10:40:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.6 2000/01/02 00:23:47 mvojkovi Exp $ */
 
 #define NEED_EVENTS
 #include "X.h"
diff --git a/xc/programs/Xserver/dix/swaprep.c b/xc/programs/Xserver/dix/swaprep.c
index dfa795881..8fe758e8b 100644
--- a/xc/programs/Xserver/dix/swaprep.c
+++ b/xc/programs/Xserver/dix/swaprep.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.3 1998/10/04 09:38:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/swaprep.c,v 3.4 1999/08/31 08:39:03 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/swapreq.c b/xc/programs/Xserver/dix/swapreq.c
index a207d47eb..abe6b280d 100644
--- a/xc/programs/Xserver/dix/swapreq.c
+++ b/xc/programs/Xserver/dix/swapreq.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.1 1996/05/06 05:56:24 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/swapreq.c,v 3.2 1998/10/04 09:38:15 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/tables.c b/xc/programs/Xserver/dix/tables.c
index 091063765..e524f3593 100644
--- a/xc/programs/Xserver/dix/tables.c
+++ b/xc/programs/Xserver/dix/tables.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.1 1996/05/06 05:56:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/tables.c,v 3.2 1998/10/04 09:38:16 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/dix/window.c b/xc/programs/Xserver/dix/window.c
index 19fd64629..e326fc629 100644
--- a/xc/programs/Xserver/dix/window.c
+++ b/xc/programs/Xserver/dix/window.c
@@ -66,7 +66,7 @@ SOFTWARE.
 *                                                               *
 *****************************************************************/
 
-/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.14 1999/09/27 06:29:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/window.c,v 3.21 2000/02/21 01:16:28 mvojkovi Exp $ */
 
 #include "misc.h"
 #include "scrnintstr.h"