Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004

46 files changed, 46 insertions, 46 deletions

diff --git a/cfb/cfb.h b/cfb/cfb.h
index b7d027905..9ceffc6d6 100644
--- a/cfb/cfb.h
+++ b/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.30 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86$ */
 
 #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY)
 
diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c
index 1dd742c60..5b19894c2 100644
--- a/cfb/cfb8bit.c
+++ b/cfb/cfb8bit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * cfb8bit.c
diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h
index 0c6b51925..d2b6ca4d3 100644
--- a/cfb/cfb8bit.h
+++ b/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.8 2003/11/17 22:20:32 dawes Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c
index 01c412b97..e8a5bd650 100644
--- a/cfb/cfb8line.c
+++ b/cfb/cfb8line.c
@@ -25,7 +25,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.19 2003/10/29 22:44:52 tsi Exp $
+ * $XFree86$
  * Jeff Anton'x fixes: cfb8line.c   97/02/07
  */
 
diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
index 6c2fa30f3..1d5cd0f87 100644
--- a/cfb/cfballpriv.c
+++ b/cfb/cfballpriv.c
@@ -25,7 +25,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.12 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c
index 18f90f1fd..15001fa5f 100644
--- a/cfb/cfbbitblt.c
+++ b/cfb/cfbbitblt.c
@@ -2,7 +2,7 @@
  * cfb copy area
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.20 2003/11/10 18:21:44 tsi Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c
index 5d2e084fd..bb07a0a9f 100644
--- a/cfb/cfbblt.c
+++ b/cfb/cfbblt.c
@@ -1,7 +1,7 @@
 /*
  * cfb copy area
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c
index 452259581..f62008817 100644
--- a/cfb/cfbbres.c
+++ b/cfb/cfbbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c
index 7fe71fa2f..c73cef0db 100644
--- a/cfb/cfbbresd.c
+++ b/cfb/cfbbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c
index 5e7b91471..724504f31 100644
--- a/cfb/cfbbstore.c
+++ b/cfb/cfbbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86$ */
 /*-
  * cfbbstore.c --
  *	Functions required by the backing-store implementation in MI.
diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c
index 1830ffa5e..a14503c62 100644
--- a/cfb/cfbcmap.c
+++ b/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.13 2001/01/17 22:36:34 dawes Exp $ */
+/* $XFree86$ */
 
 
 #include "X.h"
diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c
index ee4c18fdc..df6b996d3 100644
--- a/cfb/cfbcppl.c
+++ b/cfb/cfbcppl.c
@@ -25,7 +25,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.7 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c
index 64ec508c8..b58ac2dcb 100644
--- a/cfb/cfbfillarc.c
+++ b/cfb/cfbfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c
index c6a7270c2..638db3216 100644
--- a/cfb/cfbfillrct.c
+++ b/cfb/cfbfillrct.c
@@ -1,7 +1,7 @@
 /*
  * Fill rectangles.
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c
index 14a6a9d52..b2373de60 100644
--- a/cfb/cfbfillsp.c
+++ b/cfb/cfbfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c
index c2e7a5965..1bb7b8bb2 100644
--- a/cfb/cfbgc.c
+++ b/cfb/cfbgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c
index 737f30237..fffc3f7cc 100644
--- a/cfb/cfbgetsp.c
+++ b/cfb/cfbgetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c
index 60a012c28..0cb229b0f 100644
--- a/cfb/cfbglblt8.c
+++ b/cfb/cfbglblt8.c
@@ -23,7 +23,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.8 2003/08/06 14:04:02 eich Exp $ */
+/* $XFree86$ */
 
 /*
  * Poly glyph blt.  Accepts an arbitrary font <= 32 bits wide, in Copy mode
diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c
index 6f4f7abe6..e5a2373e8 100644
--- a/cfb/cfbhrzvert.c
+++ b/cfb/cfbhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987,1998  The Open Group
diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c
index aa1060240..eaba7a2a2 100644
--- a/cfb/cfbigblt8.c
+++ b/cfb/cfbigblt8.c
@@ -26,7 +26,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.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c
index 1983ae48a..babc2962b 100644
--- a/cfb/cfbimage.c
+++ b/cfb/cfbimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbline.c b/cfb/cfbline.c
index 432cb62d9..ba4e72b15 100644
--- a/cfb/cfbline.c
+++ b/cfb/cfbline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h
index 42056345a..6c44c60e9 100644
--- a/cfb/cfbmap.h
+++ b/cfb/cfbmap.h
@@ -26,7 +26,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.12 2003/07/19 13:22:27 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * Map names around so that multiple depths can be supported simultaneously
diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c
index cbf364770..d72aed75f 100644
--- a/cfb/cfbmskbits.c
+++ b/cfb/cfbmskbits.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h
index b7f9969dd..aefb994f3 100644
--- a/cfb/cfbmskbits.h
+++ b/cfb/cfbmskbits.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index bd2e1b6f1..b1a5c7664 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */
+/* $XFree86$ */
 /* pixmap management
    written by drewry, september 1986
 
diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c
index 0b14bc614..4bc51c8dc 100644
--- a/cfb/cfbply1rct.c
+++ b/cfb/cfbply1rct.c
@@ -25,7 +25,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.11 2003/10/30 14:53:39 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 
diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c
index c77d01961..e039e1eb7 100644
--- a/cfb/cfbpntwin.c
+++ b/cfb/cfbpntwin.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 
diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c
index d8b781397..8f06c8d53 100644
--- a/cfb/cfbpolypnt.c
+++ b/cfb/cfbpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c
index 0de172f03..a34c5eca8 100644
--- a/cfb/cfbpush8.c
+++ b/cfb/cfbpush8.c
@@ -2,7 +2,7 @@
  * Push Pixels for 8 bit displays.
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c
index 7f6e93919..9b9859abc 100644
--- a/cfb/cfbrctstp8.c
+++ b/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.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c
index 1ee6771e0..5a0b8180a 100644
--- a/cfb/cfbrrop.c
+++ b/cfb/cfbrrop.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/cfbrrop.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */
+/* $XFree86$ */
 
 /* cfb reduced rasterop computations */
 
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index d8dce082c..a41f1220f 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -26,7 +26,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.11 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef GXcopy
 #include "X.h"
diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c
index 7e0d15dd4..0e3e2c5bc 100644
--- a/cfb/cfbscrinit.c
+++ b/cfb/cfbscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbscrinit.c,v 1.20 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c
index 4f7dfaee1..3263ea692 100644
--- a/cfb/cfbsetsp.c
+++ b/cfb/cfbsetsp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.6 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "Xmd.h"
diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c
index f0a3e361e..690c2b2f3 100644
--- a/cfb/cfbsolid.c
+++ b/cfb/cfbsolid.c
@@ -25,7 +25,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.9 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 
 #include "X.h"
diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h
index 5c4f1c445..c27f69312 100644
--- a/cfb/cfbtab.h
+++ b/cfb/cfbtab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbtab.h,v 1.1 2003/07/16 01:38:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _CFBTAB_H_
 #define _CFBTAB_H_
diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c
index 0cdbddc7a..b37a3371c 100644
--- a/cfb/cfbteblt8.c
+++ b/cfb/cfbteblt8.c
@@ -3,7 +3,7 @@
  * 8 bit displays, in Copy mode with no clipping.
  */
 
-/* $XFree86: xc/programs/Xserver/cfb/cfbteblt8.c,v 1.6 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c
index 7450c7829..53f75b8f1 100644
--- a/cfb/cfbtegblt.c
+++ b/cfb/cfbtegblt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 #include	"X.h"
 #include	"Xmd.h"
diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c
index b202943e8..afc2fd735 100644
--- a/cfb/cfbtile32.c
+++ b/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.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c
index e372fe87d..49a3b4ab4 100644
--- a/cfb/cfbtileodd.c
+++ b/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.7 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c
index cae13cf3c..9e9601070 100644
--- a/cfb/cfbwindow.c
+++ b/cfb/cfbwindow.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.6 2003/11/10 18:21:45 tsi Exp $ */
+/* $XFree86$ */
 
 #include "X.h"
 #include "scrnintstr.h"
diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c
index 3703a5105..81f181443 100644
--- a/cfb/cfbzerarc.c
+++ b/cfb/cfbzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/cfb/cfbzerarc.c,v 3.5 2003/10/29 22:44:53 tsi Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/cfb/stip68kgnu.h b/cfb/stip68kgnu.h
index 9a2bac720..15b68d18e 100644
--- a/cfb/stip68kgnu.h
+++ b/cfb/stip68kgnu.h
@@ -25,7 +25,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.4 2001/12/14 19:59:25 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * Stipple stack macro for 68k GCC
diff --git a/cfb/stipsparc.s b/cfb/stipsparc.s
index 185795605..e3af29374 100644
--- a/cfb/stipsparc.s
+++ b/cfb/stipsparc.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stipsparc.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * SPARC assembly code for optimized text rendering.
diff --git a/cfb/stipsprc32.s b/cfb/stipsprc32.s
index f878fbf80..d34c71614 100644
--- a/cfb/stipsprc32.s
+++ b/cfb/stipsprc32.s
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/programs/Xserver/cfb/stipsprc32.s,v 1.5 2001/12/14 19:59:26 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * SPARC assembly code for optimized text rendering.