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

51 files changed, 51 insertions, 51 deletions

diff --git a/xc/programs/Xserver/cfb/Imakefile b/xc/programs/Xserver/cfb/Imakefile
index 44132941d..2a3582efe 100644
--- a/xc/programs/Xserver/cfb/Imakefile
+++ b/xc/programs/Xserver/cfb/Imakefile
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/71 1997/11/17 10:00:11 msr $
-XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.23 1999/08/21 13:48:13 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.24 1999/09/27 06:29:16 dawes Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
diff --git a/xc/programs/Xserver/cfb/cfb.h b/xc/programs/Xserver/cfb/cfb.h
index f07bb55f9..630107334 100644
--- a/xc/programs/Xserver/cfb/cfb.h
+++ b/xc/programs/Xserver/cfb/cfb.h
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.23 2000/02/12 03:39:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.24 2000/08/23 22:10:05 tsi Exp $ */
 
 #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY)
 
diff --git a/xc/programs/Xserver/cfb/cfb16.h b/xc/programs/Xserver/cfb/cfb16.h
index 24f60eeed..3d51cd142 100644
--- a/xc/programs/Xserver/cfb/cfb16.h
+++ b/xc/programs/Xserver/cfb/cfb16.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfb16.h,v 1.3 1998/11/22 10:36:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb16.h,v 1.4 1998/11/28 10:42:50 dawes Exp $ */
 /*
  * Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/xc/programs/Xserver/cfb/cfb24.h b/xc/programs/Xserver/cfb/cfb24.h
index 71aea2203..f1876f74d 100644
--- a/xc/programs/Xserver/cfb/cfb24.h
+++ b/xc/programs/Xserver/cfb/cfb24.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfb24.h,v 1.3 1998/11/22 10:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb24.h,v 1.4 1998/11/28 10:42:51 dawes Exp $ */
 /*
  * Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/xc/programs/Xserver/cfb/cfb32.h b/xc/programs/Xserver/cfb/cfb32.h
index cc851f10d..5ea4c13c8 100644
--- a/xc/programs/Xserver/cfb/cfb32.h
+++ b/xc/programs/Xserver/cfb/cfb32.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfb32.h,v 1.3 1998/11/22 10:37:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb32.h,v 1.4 1998/11/28 10:42:51 dawes Exp $ */
 /*
  * Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/xc/programs/Xserver/cfb/cfb8bit.c b/xc/programs/Xserver/cfb/cfb8bit.c
index 8e03bada9..1b96e36b5 100644
--- a/xc/programs/Xserver/cfb/cfb8bit.c
+++ b/xc/programs/Xserver/cfb/cfb8bit.c
@@ -22,7 +22,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.3 2000/02/12 05:43:17 dawes Exp $ */
 
 /*
  * cfb8bit.c
diff --git a/xc/programs/Xserver/cfb/cfb8bit.h b/xc/programs/Xserver/cfb/cfb8bit.h
index 77f7a2893..8f60b92e8 100644
--- a/xc/programs/Xserver/cfb/cfb8bit.h
+++ b/xc/programs/Xserver/cfb/cfb8bit.h
@@ -7,7 +7,7 @@
  * are used for depths other than 8.  Perhaps the file should be
  * renamed.  dpw
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.3 1998/10/04 09:37:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.4 2000/02/12 03:39:20 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfb8line.c b/xc/programs/Xserver/cfb/cfb8line.c
index d512aa37a..c3a205e8e 100644
--- a/xc/programs/Xserver/cfb/cfb8line.c
+++ b/xc/programs/Xserver/cfb/cfb8line.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  *
- * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.10 1999/03/28 15:32:11 dawes Exp $
+ * $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.11 2000/02/12 03:39:20 dawes Exp $
  * Jeff Anton'x fixes: cfb8line.c   97/02/07
  */
 
diff --git a/xc/programs/Xserver/cfb/cfballpriv.c b/xc/programs/Xserver/cfb/cfballpriv.c
index a7e01ab13..ec17c73f1 100644
--- a/xc/programs/Xserver/cfb/cfballpriv.c
+++ b/xc/programs/Xserver/cfb/cfballpriv.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.8 1999/04/04 08:46:06 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.9 1999/12/13 02:13:06 robin Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbbitblt.c b/xc/programs/Xserver/cfb/cfbbitblt.c
index 3de77030a..d52efb763 100644
--- a/xc/programs/Xserver/cfb/cfbbitblt.c
+++ b/xc/programs/Xserver/cfb/cfbbitblt.c
@@ -2,7 +2,7 @@
  * cfb copy area
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.9 2000/01/29 18:58:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.10 2000/02/12 03:39:21 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbblt.c b/xc/programs/Xserver/cfb/cfbblt.c
index aa737a3d4..6987c7fc6 100644
--- a/xc/programs/Xserver/cfb/cfbblt.c
+++ b/xc/programs/Xserver/cfb/cfbblt.c
@@ -1,7 +1,7 @@
 /*
  * cfb copy area
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.8 1999/12/13 02:13:07 robin Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.9 2000/02/12 03:39:22 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbbres.c b/xc/programs/Xserver/cfb/cfbbres.c
index c8bcc0d74..0da47ac3e 100644
--- a/xc/programs/Xserver/cfb/cfbbres.c
+++ b/xc/programs/Xserver/cfb/cfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.2 1998/10/04 09:37:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.3 2000/02/12 03:39:22 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbbresd.c b/xc/programs/Xserver/cfb/cfbbresd.c
index 615ab546a..92792d5f2 100644
--- a/xc/programs/Xserver/cfb/cfbbresd.c
+++ b/xc/programs/Xserver/cfb/cfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.2 1998/10/04 09:37:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.3 2000/02/12 03:39:23 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbbstore.c b/xc/programs/Xserver/cfb/cfbbstore.c
index 695f9d4e2..90020c188 100644
--- a/xc/programs/Xserver/cfb/cfbbstore.c
+++ b/xc/programs/Xserver/cfb/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.3 1999/01/26 12:17:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.4 1999/01/31 12:21:41 dawes Exp $ */
 /*-
  * cfbbstore.c --
  *	Functions required by the backing-store implementation in MI.
diff --git a/xc/programs/Xserver/cfb/cfbcmap.c b/xc/programs/Xserver/cfb/cfbcmap.c
index 3d5206390..65a65ad66 100644
--- a/xc/programs/Xserver/cfb/cfbcmap.c
+++ b/xc/programs/Xserver/cfb/cfbcmap.c
@@ -27,7 +27,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.11 1999/04/11 13:10:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */
 
 
 #include "X.h"
diff --git a/xc/programs/Xserver/cfb/cfbcppl.c b/xc/programs/Xserver/cfb/cfbcppl.c
index 098acc854..29bc3cb63 100644
--- a/xc/programs/Xserver/cfb/cfbcppl.c
+++ b/xc/programs/Xserver/cfb/cfbcppl.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.3 2000/01/29 18:58:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.4 2000/02/12 03:39:23 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbfillarc.c b/xc/programs/Xserver/cfb/cfbfillarc.c
index 33ec4ad48..246c3967d 100644
--- a/xc/programs/Xserver/cfb/cfbfillarc.c
+++ b/xc/programs/Xserver/cfb/cfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.2 1998/10/04 09:37:39 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.3 2000/02/12 03:39:24 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbfillrct.c b/xc/programs/Xserver/cfb/cfbfillrct.c
index 2d25a51c3..8154a3852 100644
--- a/xc/programs/Xserver/cfb/cfbfillrct.c
+++ b/xc/programs/Xserver/cfb/cfbfillrct.c
@@ -1,7 +1,7 @@
 /*
  * Fill rectangles.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.5 1999/03/14 03:21:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.6 2000/02/12 03:39:24 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbfillsp.c b/xc/programs/Xserver/cfb/cfbfillsp.c
index ec36bb005..4d2b6542f 100644
--- a/xc/programs/Xserver/cfb/cfbfillsp.c
+++ b/xc/programs/Xserver/cfb/cfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.3 1998/10/04 09:37:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.4 2000/02/12 03:39:24 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/xc/programs/Xserver/cfb/cfbgc.c b/xc/programs/Xserver/cfb/cfbgc.c
index 4b368766a..ae3f17f03 100644
--- a/xc/programs/Xserver/cfb/cfbgc.c
+++ b/xc/programs/Xserver/cfb/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.3 1998/10/04 09:37:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.4 2000/02/12 03:39:25 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbgetsp.c b/xc/programs/Xserver/cfb/cfbgetsp.c
index 6905a0d37..a23806cb8 100644
--- a/xc/programs/Xserver/cfb/cfbgetsp.c
+++ b/xc/programs/Xserver/cfb/cfbgetsp.c
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.5 2000/01/21 01:11:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.6 2000/02/12 03:39:25 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbglblt8.c b/xc/programs/Xserver/cfb/cfbglblt8.c
index 19f135157..ae5b75605 100644
--- a/xc/programs/Xserver/cfb/cfbglblt8.c
+++ b/xc/programs/Xserver/cfb/cfbglblt8.c
@@ -19,7 +19,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 */
-/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.2 1998/10/04 09:37:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.3 2000/02/12 03:39:26 dawes Exp $ */
 
 /*
  * Poly glyph blt.  Accepts an arbitrary font <= 32 bits wide, in Copy mode
diff --git a/xc/programs/Xserver/cfb/cfbhrzvert.c b/xc/programs/Xserver/cfb/cfbhrzvert.c
index 86ba55bcd..8af14c873 100644
--- a/xc/programs/Xserver/cfb/cfbhrzvert.c
+++ b/xc/programs/Xserver/cfb/cfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.3 1998/10/04 09:37:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.4 2000/02/12 03:39:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987,1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbigblt8.c b/xc/programs/Xserver/cfb/cfbigblt8.c
index 0101736ed..978ccb8a3 100644
--- a/xc/programs/Xserver/cfb/cfbigblt8.c
+++ b/xc/programs/Xserver/cfb/cfbigblt8.c
@@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.2 1998/03/20 21:05:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.3 1998/10/04 09:37:44 dawes Exp $ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbimage.c b/xc/programs/Xserver/cfb/cfbimage.c
index 336c4e328..e06a8da35 100644
--- a/xc/programs/Xserver/cfb/cfbimage.c
+++ b/xc/programs/Xserver/cfb/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.9 2000/01/29 18:58:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.10 2000/02/12 03:39:26 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbline.c b/xc/programs/Xserver/cfb/cfbline.c
index cabb6f7ac..5f2f1b0c3 100644
--- a/xc/programs/Xserver/cfb/cfbline.c
+++ b/xc/programs/Xserver/cfb/cfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.2 1998/10/04 09:37:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.3 2000/02/12 03:39:27 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbmap.h b/xc/programs/Xserver/cfb/cfbmap.h
index 961027a08..aa67790e1 100644
--- a/xc/programs/Xserver/cfb/cfbmap.h
+++ b/xc/programs/Xserver/cfb/cfbmap.h
@@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.7 1998/11/28 10:42:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.8 1999/12/13 02:13:07 robin Exp $ */
 
 /*
  * Map names around so that multiple depths can be supported simultaneously
diff --git a/xc/programs/Xserver/cfb/cfbmodule.c b/xc/programs/Xserver/cfb/cfbmodule.c
index e486c45f9..87af699db 100644
--- a/xc/programs/Xserver/cfb/cfbmodule.c
+++ b/xc/programs/Xserver/cfb/cfbmodule.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.7 1999/01/24 13:32:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.8 1999/01/26 05:53:48 dawes Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/xc/programs/Xserver/cfb/cfbmskbits.c b/xc/programs/Xserver/cfb/cfbmskbits.c
index 1a997e65e..0dd9eb900 100644
--- a/xc/programs/Xserver/cfb/cfbmskbits.c
+++ b/xc/programs/Xserver/cfb/cfbmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.0 1996/06/29 09:05:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.1 1998/10/04 09:37:46 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/xc/programs/Xserver/cfb/cfbmskbits.h b/xc/programs/Xserver/cfb/cfbmskbits.h
index 9186c79d1..edf07b26b 100644
--- a/xc/programs/Xserver/cfb/cfbmskbits.h
+++ b/xc/programs/Xserver/cfb/cfbmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.8 2000/02/12 03:39:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.9 2000/07/26 01:52:14 tsi Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/xc/programs/Xserver/cfb/cfbpixmap.c b/xc/programs/Xserver/cfb/cfbpixmap.c
index 29eca9995..a0af31843 100644
--- a/xc/programs/Xserver/cfb/cfbpixmap.c
+++ b/xc/programs/Xserver/cfb/cfbpixmap.c
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.3 2000/02/12 05:43:17 dawes Exp $ */
 /* pixmap management
    written by drewry, september 1986
 
diff --git a/xc/programs/Xserver/cfb/cfbply1rct.c b/xc/programs/Xserver/cfb/cfbply1rct.c
index f50302a88..50512cc09 100644
--- a/xc/programs/Xserver/cfb/cfbply1rct.c
+++ b/xc/programs/Xserver/cfb/cfbply1rct.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.5 1998/10/04 09:37:47 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.6 2000/02/12 03:39:28 dawes Exp $ */
 
 #include "X.h"
 
diff --git a/xc/programs/Xserver/cfb/cfbpntwin.c b/xc/programs/Xserver/cfb/cfbpntwin.c
index e80184949..34196d2ee 100644
--- a/xc/programs/Xserver/cfb/cfbpntwin.c
+++ b/xc/programs/Xserver/cfb/cfbpntwin.c
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.2 1999/05/15 06:24:50 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.3 2000/02/12 03:39:28 dawes Exp $ */
 
 #include "X.h"
 
diff --git a/xc/programs/Xserver/cfb/cfbpolypnt.c b/xc/programs/Xserver/cfb/cfbpolypnt.c
index 2031119de..41a071412 100644
--- a/xc/programs/Xserver/cfb/cfbpolypnt.c
+++ b/xc/programs/Xserver/cfb/cfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.2 1998/10/04 09:37:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.3 2000/02/12 03:39:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbpush8.c b/xc/programs/Xserver/cfb/cfbpush8.c
index 7014fb6ec..408732f66 100644
--- a/xc/programs/Xserver/cfb/cfbpush8.c
+++ b/xc/programs/Xserver/cfb/cfbpush8.c
@@ -2,7 +2,7 @@
  * Push Pixels for 8 bit displays.
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.3 1998/10/04 09:37:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.4 2000/02/12 03:39:29 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbrctstp8.c b/xc/programs/Xserver/cfb/cfbrctstp8.c
index 559a67229..4cb43ee67 100644
--- a/xc/programs/Xserver/cfb/cfbrctstp8.c
+++ b/xc/programs/Xserver/cfb/cfbrctstp8.c
@@ -1,7 +1,7 @@
 /*
  * Fill 32 bit stippled rectangles for 8 bit frame buffers
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.2 1998/10/04 09:37:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.3 2000/02/12 03:39:29 dawes Exp $ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbrrop.c b/xc/programs/Xserver/cfb/cfbrrop.c
index b467488ab..653e495b2 100644
--- a/xc/programs/Xserver/cfb/cfbrrop.c
+++ b/xc/programs/Xserver/cfb/cfbrrop.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.3 2000/02/12 05:43:18 dawes Exp $ */
 
 /* cfb reduced rasterop computations */
 
diff --git a/xc/programs/Xserver/cfb/cfbrrop.h b/xc/programs/Xserver/cfb/cfbrrop.h
index 990b30ed6..a1598f60a 100644
--- a/xc/programs/Xserver/cfb/cfbrrop.h
+++ b/xc/programs/Xserver/cfb/cfbrrop.h
@@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.4 1999/03/28 15:32:11 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.5 2000/02/12 03:39:30 dawes Exp $ */
 
 #ifndef GXcopy
 #include "X.h"
diff --git a/xc/programs/Xserver/cfb/cfbscrinit.c b/xc/programs/Xserver/cfb/cfbscrinit.c
index 726269254..1cc8a768f 100644
--- a/xc/programs/Xserver/cfb/cfbscrinit.c
+++ b/xc/programs/Xserver/cfb/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.17 1998/12/20 11:57:29 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.18 2000/02/12 03:39:31 dawes Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/xc/programs/Xserver/cfb/cfbsetsp.c b/xc/programs/Xserver/cfb/cfbsetsp.c
index 1f0f739d8..b98188da7 100644
--- a/xc/programs/Xserver/cfb/cfbsetsp.c
+++ b/xc/programs/Xserver/cfb/cfbsetsp.c
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.1 1998/10/04 09:37:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.2 2000/02/12 03:39:31 dawes Exp $ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbsolid.c b/xc/programs/Xserver/cfb/cfbsolid.c
index 014b944c9..4a7749ed4 100644
--- a/xc/programs/Xserver/cfb/cfbsolid.c
+++ b/xc/programs/Xserver/cfb/cfbsolid.c
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.3 1998/10/04 13:23:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.4 2000/02/12 03:39:31 dawes Exp $ */
 
 
 #include "X.h"
diff --git a/xc/programs/Xserver/cfb/cfbteblt8.c b/xc/programs/Xserver/cfb/cfbteblt8.c
index 2b27e95db..8ad7e578e 100644
--- a/xc/programs/Xserver/cfb/cfbteblt8.c
+++ b/xc/programs/Xserver/cfb/cfbteblt8.c
@@ -3,7 +3,7 @@
  * 8 bit displays, in Copy mode with no clipping.
  */
 
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.3 2000/02/12 05:43:18 dawes Exp $ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/cfbtegblt.c b/xc/programs/Xserver/cfb/cfbtegblt.c
index 2a541ff0e..7d82356b0 100644
--- a/xc/programs/Xserver/cfb/cfbtegblt.c
+++ b/xc/programs/Xserver/cfb/cfbtegblt.c
@@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.2 1998/10/04 09:37:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.3 2000/02/12 03:39:32 dawes Exp $ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/xc/programs/Xserver/cfb/cfbtile32.c b/xc/programs/Xserver/cfb/cfbtile32.c
index 79399ae57..54c94d791 100644
--- a/xc/programs/Xserver/cfb/cfbtile32.c
+++ b/xc/programs/Xserver/cfb/cfbtile32.c
@@ -2,7 +2,7 @@
  * Fill 32 bit tiled rectangles.  Used by both PolyFillRect and PaintWindow.
  * no depth dependencies.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.2 1998/10/04 09:37:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtile32.c,v 3.3 2000/02/12 03:39:33 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbtileodd.c b/xc/programs/Xserver/cfb/cfbtileodd.c
index 7ec9776f4..548236383 100644
--- a/xc/programs/Xserver/cfb/cfbtileodd.c
+++ b/xc/programs/Xserver/cfb/cfbtileodd.c
@@ -2,7 +2,7 @@
  * Fill odd tiled rectangles and spans.
  * no depth dependencies.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.2 1999/01/23 09:55:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbtileodd.c,v 3.3 2000/02/12 03:39:33 dawes Exp $ */
 
 /*
 
diff --git a/xc/programs/Xserver/cfb/cfbunmap.h b/xc/programs/Xserver/cfb/cfbunmap.h
index 98ac71b08..e94f45482 100644
--- a/xc/programs/Xserver/cfb/cfbunmap.h
+++ b/xc/programs/Xserver/cfb/cfbunmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbunmap.h,v 1.4 1998/11/28 10:42:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbunmap.h,v 1.5 1999/12/13 02:13:07 robin Exp $ */
 /*
  * Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
diff --git a/xc/programs/Xserver/cfb/cfbzerarc.c b/xc/programs/Xserver/cfb/cfbzerarc.c
index 0a5fb508a..4b408b363 100644
--- a/xc/programs/Xserver/cfb/cfbzerarc.c
+++ b/xc/programs/Xserver/cfb/cfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.0 1996/06/29 09:05:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.1 1998/10/04 09:37:53 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/xc/programs/Xserver/cfb/stip68kgnu.h b/xc/programs/Xserver/cfb/stip68kgnu.h
index 05797ce33..0406b3ac9 100644
--- a/xc/programs/Xserver/cfb/stip68kgnu.h
+++ b/xc/programs/Xserver/cfb/stip68kgnu.h
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.1 1997/02/25 14:19:51 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/stip68kgnu.h,v 3.2 1998/10/04 09:37:54 dawes Exp $ */
 
 /*
  * Stipple stack macro for 68k GCC
diff --git a/xc/programs/Xserver/cfb/stipple68k.s b/xc/programs/Xserver/cfb/stipple68k.s
index 81ae9e489..17fa205a8 100644
--- a/xc/programs/Xserver/cfb/stipple68k.s
+++ b/xc/programs/Xserver/cfb/stipple68k.s
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stipple68k.s,v 3.0 1996/08/13 11:27:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/cfb/stipple68k.s,v 3.1 1998/10/04 09:37:54 dawes Exp $ */
 
 /*
  * Stipple code for 68k processors
diff --git a/xc/programs/Xserver/cfb/stipsparc.s b/xc/programs/Xserver/cfb/stipsparc.s
index f5fc8b65f..3203cd4e2 100644
--- a/xc/programs/Xserver/cfb/stipsparc.s
+++ b/xc/programs/Xserver/cfb/stipsparc.s
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.3 1999/03/29 13:17:03 dawes Exp $ */
 
 /*
  * SPARC assembly code for optimized text rendering.
diff --git a/xc/programs/Xserver/cfb/stipsprc32.s b/xc/programs/Xserver/cfb/stipsprc32.s
index f1a2db74a..416ca71e8 100644
--- a/xc/programs/Xserver/cfb/stipsprc32.s
+++ b/xc/programs/Xserver/cfb/stipsprc32.s
@@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.3 1999/03/29 13:17:03 dawes Exp $ */
 
 /*
  * SPARC assembly code for optimized text rendering.