First pass of XFree86 4.0.99.2 merge.

46 files changed, 46 insertions, 81 deletions

diff --git a/xc/programs/Xserver/GL/glx/g_disptab.c b/xc/programs/Xserver/GL/glx/g_disptab.c
index 52b378bd6..ee187330d 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab.c
+++ b/xc/programs/Xserver/GL/glx/g_disptab.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/g_disptab.h b/xc/programs/Xserver/GL/glx/g_disptab.h
index 56d26a1f7..a24f7a12a 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab.h
+++ b/xc/programs/Xserver/GL/glx/g_disptab.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_h_
 #define _GLX_g_disptab_h_
diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
index 5923aa225..e839afe4f 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
+++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
index f28d3b9ff..193da6ea7 100644
--- a/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
+++ b/xc/programs/Xserver/GL/glx/g_disptab_EXT.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_EXT_h_
 #define _GLX_g_disptab_EXT_h_
diff --git a/xc/programs/Xserver/GL/glx/g_render.c b/xc/programs/Xserver/GL/glx/g_render.c
index 7948fab82..52ecab5b1 100644
--- a/xc/programs/Xserver/GL/glx/g_render.c
+++ b/xc/programs/Xserver/GL/glx/g_render.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/g_renderswap.c b/xc/programs/Xserver/GL/glx/g_renderswap.c
index 5673420a3..0a423d4a6 100644
--- a/xc/programs/Xserver/GL/glx/g_renderswap.c
+++ b/xc/programs/Xserver/GL/glx/g_renderswap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/g_single.c b/xc/programs/Xserver/GL/glx/g_single.c
index cb9f4eb33..36f97e0fc 100644
--- a/xc/programs/Xserver/GL/glx/g_single.c
+++ b/xc/programs/Xserver/GL/glx/g_single.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/g_singleswap.c b/xc/programs/Xserver/GL/glx/g_singleswap.c
index 4b88c4ee9..89f595266 100644
--- a/xc/programs/Xserver/GL/glx/g_singleswap.c
+++ b/xc/programs/Xserver/GL/glx/g_singleswap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
diff --git a/xc/programs/Xserver/GL/glx/global.c b/xc/programs/Xserver/GL/glx/global.c
index 5f0b104e1..9cd011ec9 100644
--- a/xc/programs/Xserver/GL/glx/global.c
+++ b/xc/programs/Xserver/GL/glx/global.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:40 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/global.c,v 1.2 2001/01/08 16:21:40 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/glxbuf.c b/xc/programs/Xserver/GL/glx/glxbuf.c
index 0ee66ddd4..7edfea197 100644
--- a/xc/programs/Xserver/GL/glx/glxbuf.c
+++ b/xc/programs/Xserver/GL/glx/glxbuf.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:40 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxbuf.c,v 1.2 2001/01/08 16:21:40 nathanh Exp $
 */
 
 #include "glxserver.h"
diff --git a/xc/programs/Xserver/GL/glx/glxbuf.h b/xc/programs/Xserver/GL/glx/glxbuf.h
index 2eae08771..a298b3471 100644
--- a/xc/programs/Xserver/GL/glx/glxbuf.h
+++ b/xc/programs/Xserver/GL/glx/glxbuf.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glxbuf_h_
 #define _glxbuf_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxbuf.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void __glXFBInitDrawable(__GLXdrawablePrivate *glxPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxcmds.c b/xc/programs/Xserver/GL/glx/glxcmds.c
index 3cc7ba39e..d495fc8eb 100644
--- a/xc/programs/Xserver/GL/glx/glxcmds.c
+++ b/xc/programs/Xserver/GL/glx/glxcmds.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.7 2001/03/25 05:32:01 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.4 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcmds.c,v 1.4 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
@@ -65,7 +64,6 @@ static __GLimports imports = {
     __glXImpFclose,
     __glXImpFprintf,
     __glXImpGetDrawablePrivate,
-    NULL,
     NULL
 };
 
diff --git a/xc/programs/Xserver/GL/glx/glxcmdsswap.c b/xc/programs/Xserver/GL/glx/glxcmdsswap.c
index d48597940..2363ee0d4 100644
--- a/xc/programs/Xserver/GL/glx/glxcmdsswap.c
+++ b/xc/programs/Xserver/GL/glx/glxcmdsswap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/glxcontext.h b/xc/programs/Xserver/GL/glx/glxcontext.h
index 7e055e42a..32b4b248a 100644
--- a/xc/programs/Xserver/GL/glx/glxcontext.h
+++ b/xc/programs/Xserver/GL/glx/glxcontext.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _GLX_context_h_
 #define _GLX_context_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxcontext.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 typedef struct __GLXcontextRec __GLXcontext;
diff --git a/xc/programs/Xserver/GL/glx/glxdrawable.h b/xc/programs/Xserver/GL/glx/glxdrawable.h
index 826cc0b5b..9d7ba55ba 100644
--- a/xc/programs/Xserver/GL/glx/glxdrawable.h
+++ b/xc/programs/Xserver/GL/glx/glxdrawable.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 typedef struct {
diff --git a/xc/programs/Xserver/GL/glx/glxerror.h b/xc/programs/Xserver/GL/glx/glxerror.h
index bbfd95f12..3c1e93c61 100644
--- a/xc/programs/Xserver/GL/glx/glxerror.h
+++ b/xc/programs/Xserver/GL/glx/glxerror.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _GLX_error_h_
 #define _GLX_error_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxerror.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxext.c b/xc/programs/Xserver/GL/glx/glxext.c
index 6910603b8..9ab9d8973 100644
--- a/xc/programs/Xserver/GL/glx/glxext.c
+++ b/xc/programs/Xserver/GL/glx/glxext.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.6 2001/02/16 13:24:05 eich Exp $
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.7 2001/03/21 16:29:36 dawes Exp $
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
 ** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
@@ -16,8 +16,6 @@
 ** Those portions of the Subject Software created by Silicon Graphics, Inc.
 ** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
 **
-** $Date: 2001/03/19 21:39:05 $ $Revision: 1.3 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxext.c,v 1.3 2001/03/19 21:39:05 dawes Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/glxext.h b/xc/programs/Xserver/GL/glx/glxext.h
index c87cd3314..7dd57c1d7 100644
--- a/xc/programs/Xserver/GL/glx/glxext.h
+++ b/xc/programs/Xserver/GL/glx/glxext.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glxext_h_
 #define _glxext_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxext.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxfb.c b/xc/programs/Xserver/GL/glx/glxfb.c
index 6775623fd..4ce952d51 100644
--- a/xc/programs/Xserver/GL/glx/glxfb.c
+++ b/xc/programs/Xserver/GL/glx/glxfb.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxfb.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxfb.h b/xc/programs/Xserver/GL/glx/glxfb.h
index 98d7821fc..44a72a3e2 100644
--- a/xc/programs/Xserver/GL/glx/glxfb.h
+++ b/xc/programs/Xserver/GL/glx/glxfb.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glxfb_h_
 #define _glxfb_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxfb.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void __glXInitFB(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glximports.c b/xc/programs/Xserver/GL/glx/glximports.c
index 933557371..398c59962 100644
--- a/xc/programs/Xserver/GL/glx/glximports.c
+++ b/xc/programs/Xserver/GL/glx/glximports.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glximports.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #include "glxserver.h"
diff --git a/xc/programs/Xserver/GL/glx/glximports.h b/xc/programs/Xserver/GL/glx/glximports.h
index 6744a8c9d..4f3513d32 100644
--- a/xc/programs/Xserver/GL/glx/glximports.h
+++ b/xc/programs/Xserver/GL/glx/glximports.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glximports_h_
 #define _glximports_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glximports.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void *__glXImpMalloc(__GLcontext *gc, size_t size);
diff --git a/xc/programs/Xserver/GL/glx/glxmem.c b/xc/programs/Xserver/GL/glx/glxmem.c
index 6c9323f61..bc0c371e7 100644
--- a/xc/programs/Xserver/GL/glx/glxmem.c
+++ b/xc/programs/Xserver/GL/glx/glxmem.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxmem.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxmem.h b/xc/programs/Xserver/GL/glx/glxmem.h
index 7fd6cd59e..93a277559 100644
--- a/xc/programs/Xserver/GL/glx/glxmem.h
+++ b/xc/programs/Xserver/GL/glx/glxmem.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glxmem_h_
 #define _glxmem_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxmem.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void __glXInitMem(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxpix.c b/xc/programs/Xserver/GL/glx/glxpix.c
index 77cd21213..b21d4ade9 100644
--- a/xc/programs/Xserver/GL/glx/glxpix.c
+++ b/xc/programs/Xserver/GL/glx/glxpix.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -32,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxpix.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/glxpix.h b/xc/programs/Xserver/GL/glx/glxpix.h
index ca5e3e038..d7a9afab0 100644
--- a/xc/programs/Xserver/GL/glx/glxpix.h
+++ b/xc/programs/Xserver/GL/glx/glxpix.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
 #ifndef _glxpix_h_
 #define _glxpix_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxpix.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void __glXInitPix(__GLdrawableBuffer *buf, __GLdrawablePrivate *glPriv,
diff --git a/xc/programs/Xserver/GL/glx/glxscreens.c b/xc/programs/Xserver/GL/glx/glxscreens.c
index 7d88565b2..5e98e9e1e 100644
--- a/xc/programs/Xserver/GL/glx/glxscreens.c
+++ b/xc/programs/Xserver/GL/glx/glxscreens.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.5 2001/02/16 13:24:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.6 2001/03/21 16:29:36 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -32,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/19 21:39:05 $ $Revision: 1.5 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxscreens.c,v 1.5 2001/03/19 21:39:05 dawes Exp $
 */
 
 #ifdef IN_MODULE
diff --git a/xc/programs/Xserver/GL/glx/glxscreens.h b/xc/programs/Xserver/GL/glx/glxscreens.h
index ea3183b73..138e2eaf1 100644
--- a/xc/programs/Xserver/GL/glx/glxscreens.h
+++ b/xc/programs/Xserver/GL/glx/glxscreens.h
@@ -1,7 +1,7 @@
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_
 
-/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.3 2001/02/16 13:24:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -35,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/19 21:39:05 $ $Revision: 1.3 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxscreens.h,v 1.3 2001/03/19 21:39:05 dawes Exp $
 */
 
 #include "GL/internal/glcore.h"
diff --git a/xc/programs/Xserver/GL/glx/glxserver.h b/xc/programs/Xserver/GL/glx/glxserver.h
index a04318eb7..1eb3764cc 100644
--- a/xc/programs/Xserver/GL/glx/glxserver.h
+++ b/xc/programs/Xserver/GL/glx/glxserver.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef _GLX_server_h_
 #define _GLX_server_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxserver.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #include <X11/X.h>
diff --git a/xc/programs/Xserver/GL/glx/glxutil.c b/xc/programs/Xserver/GL/glx/glxutil.c
index 4544447ec..a32dc5e43 100644
--- a/xc/programs/Xserver/GL/glx/glxutil.c
+++ b/xc/programs/Xserver/GL/glx/glxutil.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxutil.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/glxutil.h b/xc/programs/Xserver/GL/glx/glxutil.h
index 8bf757672..a4d40afc4 100644
--- a/xc/programs/Xserver/GL/glx/glxutil.h
+++ b/xc/programs/Xserver/GL/glx/glxutil.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef _glxcmds_h_
 #define _glxcmds_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/glxutil.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern void __glXNop(void);
diff --git a/xc/programs/Xserver/GL/glx/impsize.h b/xc/programs/Xserver/GL/glx/impsize.h
index c1ab790f6..f4c2778f4 100644
--- a/xc/programs/Xserver/GL/glx/impsize.h
+++ b/xc/programs/Xserver/GL/glx/impsize.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef _impsize_h_
 #define _impsize_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/impsize.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /*
diff --git a/xc/programs/Xserver/GL/glx/render2.c b/xc/programs/Xserver/GL/glx/render2.c
index 06cfcca84..04bef0e8c 100644
--- a/xc/programs/Xserver/GL/glx/render2.c
+++ b/xc/programs/Xserver/GL/glx/render2.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/render2.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /* #define NEED_REPLIES */
diff --git a/xc/programs/Xserver/GL/glx/render2swap.c b/xc/programs/Xserver/GL/glx/render2swap.c
index 8e8c115a8..25f9f3915 100644
--- a/xc/programs/Xserver/GL/glx/render2swap.c
+++ b/xc/programs/Xserver/GL/glx/render2swap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/render2swap.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 /* #define NEED_REPLIES */
diff --git a/xc/programs/Xserver/GL/glx/renderpix.c b/xc/programs/Xserver/GL/glx/renderpix.c
index 5474f4172..ad5625dd6 100644
--- a/xc/programs/Xserver/GL/glx/renderpix.c
+++ b/xc/programs/Xserver/GL/glx/renderpix.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/renderpix.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/renderpixswap.c b/xc/programs/Xserver/GL/glx/renderpixswap.c
index 1fa7b2fc3..3b0e1f6b7 100644
--- a/xc/programs/Xserver/GL/glx/renderpixswap.c
+++ b/xc/programs/Xserver/GL/glx/renderpixswap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/rensize.c b/xc/programs/Xserver/GL/glx/rensize.c
index f11d4a126..22dace4e8 100644
--- a/xc/programs/Xserver/GL/glx/rensize.c
+++ b/xc/programs/Xserver/GL/glx/rensize.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/rensize.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #include <GL/gl.h>
diff --git a/xc/programs/Xserver/GL/glx/rensizetab.c b/xc/programs/Xserver/GL/glx/rensizetab.c
index 3fd014ae4..71a96d25c 100644
--- a/xc/programs/Xserver/GL/glx/rensizetab.c
+++ b/xc/programs/Xserver/GL/glx/rensizetab.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/rensizetab.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #include "glxserver.h"
diff --git a/xc/programs/Xserver/GL/glx/single2.c b/xc/programs/Xserver/GL/glx/single2.c
index a748f89d0..513827593 100644
--- a/xc/programs/Xserver/GL/glx/single2.c
+++ b/xc/programs/Xserver/GL/glx/single2.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/single2.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/single2swap.c b/xc/programs/Xserver/GL/glx/single2swap.c
index 41878b22e..25b92d84c 100644
--- a/xc/programs/Xserver/GL/glx/single2swap.c
+++ b/xc/programs/Xserver/GL/glx/single2swap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/single2swap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/single2swap.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/singlepix.c b/xc/programs/Xserver/GL/glx/singlepix.c
index 0e609ddc4..85be77d85 100644
--- a/xc/programs/Xserver/GL/glx/singlepix.c
+++ b/xc/programs/Xserver/GL/glx/singlepix.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlepix.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/singlepixswap.c b/xc/programs/Xserver/GL/glx/singlepixswap.c
index 257e60e0f..64bcc60f1 100644
--- a/xc/programs/Xserver/GL/glx/singlepixswap.c
+++ b/xc/programs/Xserver/GL/glx/singlepixswap.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES
diff --git a/xc/programs/Xserver/GL/glx/singlesize.c b/xc/programs/Xserver/GL/glx/singlesize.c
index f530b64cb..b7ca83245 100644
--- a/xc/programs/Xserver/GL/glx/singlesize.c
+++ b/xc/programs/Xserver/GL/glx/singlesize.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlesize.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #include <GL/gl.h>
diff --git a/xc/programs/Xserver/GL/glx/singlesize.h b/xc/programs/Xserver/GL/glx/singlesize.h
index ce176ab07..829338094 100644
--- a/xc/programs/Xserver/GL/glx/singlesize.h
+++ b/xc/programs/Xserver/GL/glx/singlesize.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef _singlesize_h_
 #define _singlesize_h_
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/singlesize.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 extern GLint __glReadPixels_size(GLenum format, GLenum type,
diff --git a/xc/programs/Xserver/GL/glx/unpack.h b/xc/programs/Xserver/GL/glx/unpack.h
index 0aff20ffe..a076d344a 100644
--- a/xc/programs/Xserver/GL/glx/unpack.h
+++ b/xc/programs/Xserver/GL/glx/unpack.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__
 
@@ -34,8 +35,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/unpack.h,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define __GLX_PAD(s) (((s)+3) & (GLuint)~3)
diff --git a/xc/programs/Xserver/GL/glx/xfont.c b/xc/programs/Xserver/GL/glx/xfont.c
index e449816ec..3ea767d2b 100644
--- a/xc/programs/Xserver/GL/glx/xfont.c
+++ b/xc/programs/Xserver/GL/glx/xfont.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@@ -31,8 +32,6 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/01/08 16:21:41 $ $Revision: 1.2 $
-** $Header: /home/ajax/dri-backup/xc/xc/programs/Xserver/GL/glx/xfont.c,v 1.2 2001/01/08 16:21:41 nathanh Exp $
 */
 
 #define NEED_REPLIES