merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE

29 files changed, 29 insertions, 29 deletions

diff --git a/DRI.txt b/DRI.txt
index 5bac4f3..56a87c9 100644
--- a/DRI.txt
+++ b/DRI.txt
@@ -9,7 +9,7 @@ Permission is granted to make and distribute verbatim copies
 of this document provided the copyright notice and this permission
 notice are preserved on all copies.
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.1 1999/06/14 07:31:50 dawes Exp $
 
 GLINT State Transition Strategy
 
diff --git a/README.pm3 b/README.pm3
index 4d6972e..c9de848 100644
--- a/README.pm3
+++ b/README.pm3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.12 2001/08/18 11:37:30 alanh Exp $ */
   
 STATUS as of Tue,  8 May 2001 19:01:39 +0200
   
diff --git a/man/glint.man b/man/glint.man
index 166de51..c3c1da7 100644
--- a/man/glint.man
+++ b/man/glint.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.6 2003/02/14 12:03:09 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man,v 1.5 2001/12/17 20:52:32 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH GLINT __drivermansuffix__ __vendorversion__
diff --git a/src/IBMramdac.c b/src/IBMramdac.c
index 2a41fab..b3728b9 100644
--- a/src/IBMramdac.c
+++ b/src/IBMramdac.c
@@ -24,7 +24,7 @@
  * glintOutIBMRGBIndReg() and glintInIBMRGBIndReg() are used to access 
  * the indirect IBM RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.6 1999/02/12 22:52:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/IBMramdac.c,v 1.5 1998/08/29 14:34:34 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/TIramdac.c b/src/TIramdac.c
index e471c01..92b357d 100644
--- a/src/TIramdac.c
+++ b/src/TIramdac.c
@@ -27,7 +27,7 @@
  * glintOutTIIndReg() and glintInTIIndReg() are used to access 
  * the indirect TI RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.5 2002/10/30 12:52:15 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/TIramdac.c,v 1.4 2001/01/31 16:14:52 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/glint.h b/src/glint.h
index 0721786..4cf8d2f 100644
--- a/src/glint.h
+++ b/src/glint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.59 2003/04/23 21:51:36 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint.h,v 1.58tsi Exp $ */
 /*
  * Copyright 1997-2001 by Alan Hourihane <alanh@fairlite.demon.co.uk>
  *
diff --git a/src/glint_common.h b/src/glint_common.h
index ec601f9..0670c4c 100644
--- a/src/glint_common.h
+++ b/src/glint_common.h
@@ -25,7 +25,7 @@
  * Converted to common header format:
  *   Jens Owen <jens@tungstengraphics.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.2 2003/04/03 16:52:18 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.1 2002/10/30 12:52:15 alanh Exp $
  *
  */
 
diff --git a/src/glint_dga.c b/src/glint_dga.c
index ece7657..2937145 100644
--- a/src/glint_dga.c
+++ b/src/glint_dga.c
@@ -21,7 +21,7 @@
  *
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.4 2001/12/16 21:36:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dga.c,v 1.3 2001/04/10 20:33:30 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/glint_dri.c b/src/glint_dri.c
index dd88527..7b34f2a 100644
--- a/src/glint_dri.c
+++ b/src/glint_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.38 2003/11/12 17:56:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c,v 1.37 2003/11/10 18:22:20 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/glint_dri.h b/src/glint_dri.h
index 3952759..7b00143 100644
--- a/src/glint_dri.h
+++ b/src/glint_dri.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.7 2002/10/30 12:52:16 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.6 2002/02/22 21:45:16 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/glint_dripriv.h b/src/glint_dripriv.h
index 15d5e48..7803c4b 100644
--- a/src/glint_dripriv.h
+++ b/src/glint_dripriv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.6 2002/10/30 12:52:16 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dripriv.h,v 1.5 2000/06/17 10:00:13 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff --git a/src/glint_driver.c b/src/glint_driver.c
index fb0d34b..da3c6f2 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -28,7 +28,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen, 
  * Siemens Nixdorf Informationssysteme and Appian Graphics.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.163 2003/11/03 22:17:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_driver.c,v 1.162 2003/11/03 05:11:11 tsi Exp $ */
 
 #include "fb.h"
 #include "cfb8_32.h"
diff --git a/src/glint_regs.h b/src/glint_regs.h
index bac6c46..e3cb87e 100644
--- a/src/glint_regs.h
+++ b/src/glint_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.37 2003/11/03 05:11:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36tsi Exp $ */
 
 /*
  * glint register file 
diff --git a/src/glint_shadow.c b/src/glint_shadow.c
index 2dfcef8..12a5ee6 100644
--- a/src/glint_shadow.c
+++ b/src/glint_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.1 1999/11/19 13:54:32 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_shadow.c,v 1.0 1999/08/22 05:57:35 dawes Exp $ */
 
 /*
    Copyright (c) 1999,  The XFree86 Project Inc. 
diff --git a/src/pm2_accel.c b/src/pm2_accel.c
index addc92e..b093bcc 100644
--- a/src/pm2_accel.c
+++ b/src/pm2_accel.c
@@ -30,7 +30,7 @@
  * 
  * Permedia 2 accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.32 2003/10/08 15:48:39 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_accel.c,v 1.30 2001/05/30 11:41:53 alanh Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
diff --git a/src/pm2_dac.c b/src/pm2_dac.c
index 14f0bec..08c8141 100644
--- a/src/pm2_dac.c
+++ b/src/pm2_dac.c
@@ -28,7 +28,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.27 2003/11/03 05:11:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_dac.c,v 1.26tsi Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
diff --git a/src/pm2_video.c b/src/pm2_video.c
index e64cdda..45918d6 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -21,7 +21,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  */
  
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.26 2003/11/10 18:22:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2_video.c,v 1.25tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm2ramdac.c b/src/pm2ramdac.c
index 26f6467..61cfb9a 100644
--- a/src/pm2ramdac.c
+++ b/src/pm2ramdac.c
@@ -24,7 +24,7 @@
  * Permedia2OutIndReg() and Permedia2InIndReg() are used to access 
  * the indirect Permedia2 RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.12 2003/10/08 15:48:40 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2ramdac.c,v 1.10 1999/07/18 03:26:57 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm2v_dac.c b/src/pm2v_dac.c
index e152816..0bd2d9e 100644
--- a/src/pm2v_dac.c
+++ b/src/pm2v_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.30 2003/11/03 05:11:13 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2v_dac.c,v 1.29tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm2vramdac.c b/src/pm2vramdac.c
index ae5b1d0..4b55d78 100644
--- a/src/pm2vramdac.c
+++ b/src/pm2vramdac.c
@@ -24,7 +24,7 @@
  * Permedia2vOutIndReg() and Permedia2vInIndReg() are used to access 
  * the indirect Permedia2v RAMDAC registers only.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.6 2001/01/31 16:15:00 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm2vramdac.c,v 1.5 2001/01/30 10:06:35 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm3_accel.c b/src/pm3_accel.c
index 9599590..9745db8 100644
--- a/src/pm3_accel.c
+++ b/src/pm3_accel.c
@@ -26,7 +26,7 @@
  * 
  * Permedia 3 accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.31 2003/01/06 00:04:54 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c,v 1.30 2002/05/21 14:38:04 alanh Exp $ */
 
 #include "Xarch.h"
 #include "xf86.h"
diff --git a/src/pm3_dac.c b/src/pm3_dac.c
index c724df6..435fff5 100644
--- a/src/pm3_dac.c
+++ b/src/pm3_dac.c
@@ -26,7 +26,7 @@
  * this work is sponsored by Appian Graphics.
  * 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.34 2003/11/03 05:11:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_dac.c,v 1.33tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm3_regs.h b/src/pm3_regs.h
index be9fc51..b029155 100644
--- a/src/pm3_regs.h
+++ b/src/pm3_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.9tsi Exp $ */
 
 /*
  * glint register file 
diff --git a/src/pm3_video.c b/src/pm3_video.c
index 35f0e05..e16eea8 100644
--- a/src/pm3_video.c
+++ b/src/pm3_video.c
@@ -22,7 +22,7 @@
  * Authors: Alan Hourihane, alanh@fairlite.demon.co.uk
  *          Sven Luther <luther@dpt-info.u-strasbg.fr>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.15 2003/11/10 18:22:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v 1.14tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm_accel.c b/src/pm_accel.c
index 8f00d98..127a06f 100644
--- a/src/pm_accel.c
+++ b/src/pm_accel.c
@@ -28,7 +28,7 @@
  * 
  * Permedia accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.25 2003/11/03 05:11:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_accel.c,v 1.24tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/pm_dac.c b/src/pm_dac.c
index 73980b8..a25f113 100644
--- a/src/pm_dac.c
+++ b/src/pm_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.12 2003/11/03 05:11:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm_dac.c,v 1.11tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/sx_accel.c b/src/sx_accel.c
index e972de6..975602d 100644
--- a/src/sx_accel.c
+++ b/src/sx_accel.c
@@ -28,7 +28,7 @@
  * 
  * GLINT 300SX accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.9 2003/10/08 15:48:40 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/sx_accel.c,v 1.7 2001/05/29 11:23:38 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tx_accel.c b/src/tx_accel.c
index 609cee9..9c0ff1e 100644
--- a/src/tx_accel.c
+++ b/src/tx_accel.c
@@ -28,7 +28,7 @@
  * 
  * GLINT 500TX / MX accelerated options.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.29 2003/10/08 15:48:40 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_accel.c,v 1.27 2001/05/29 11:23:38 alanh Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/tx_dac.c b/src/tx_dac.c
index 36f5ec4..8704abf 100644
--- a/src/tx_dac.c
+++ b/src/tx_dac.c
@@ -27,7 +27,7 @@
  * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and
  * Siemens Nixdorf Informationssysteme
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.16 2003/11/03 05:11:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/tx_dac.c,v 1.15tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"