Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

32 files changed, 0 insertions, 57 deletions

diff --git a/afb/afb.h b/afb/afb.h
index e89d3a088..c05cc5511 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.10 2003/10/29 22:15:19 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afb.h,v 5.31 94/04/17 20:28:15 dpw Exp $ */
 /* Monochrome Frame Buffer definitions
    written by drewry, september 1986
 */
diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c
index 7c4502c93..594e987a8 100644
--- a/afb/afbbitblt.c
+++ b/afb/afbbitblt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.5tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbblt.c b/afb/afbblt.c
index 9eb0227f2..9eb4e4732 100644
--- a/afb/afbblt.c
+++ b/afb/afbblt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.0 1996/08/18 01:45:24 dawes Exp $ */
 /*
  * afb copy area
  */
@@ -31,7 +30,6 @@ in this Software without prior written authorization from the X Consortium.
 Author: Keith Packard
 
 */
-/* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbbres.c b/afb/afbbres.c
index 6ee09b9e4..e8f1b3b85 100644
--- a/afb/afbbres.c
+++ b/afb/afbbres.c
@@ -47,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbbresd.c b/afb/afbbresd.c
index 52cb62cab..4495c8cf8 100644
--- a/afb/afbbresd.c
+++ b/afb/afbbresd.c
@@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbbstore.c b/afb/afbbstore.c
index a74a9d9b8..f7f1062e2 100644
--- a/afb/afbbstore.c
+++ b/afb/afbbstore.c
@@ -1,5 +1,4 @@
 /* $XFree86$ */
-/* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /*
 
diff --git a/afb/afbclip.c b/afb/afbclip.c
index 89314f134..15be4051c 100644
--- a/afb/afbclip.c
+++ b/afb/afbclip.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.2 2001/10/28 03:32:57 tsi Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbcmap.c b/afb/afbcmap.c
index 5043d97a6..e3b95fbec 100644
--- a/afb/afbcmap.c
+++ b/afb/afbcmap.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.0 1996/08/18 01:45:30 dawes Exp $ */
-/* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
 
diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c
index 30e0bd3a5..fa685ba9a 100644
--- a/afb/afbfillarc.c
+++ b/afb/afbfillarc.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.1 1998/03/20 21:04:54 hohndel Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
@@ -26,7 +25,6 @@ in this Software without prior written authorization from the X Consortium.
 
 ********************************************************/
 
-/* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c
index ed2e6031e..06fb37365 100644
--- a/afb/afbfillrct.c
+++ b/afb/afbfillrct.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c
index ffb633409..539c3457c 100644
--- a/afb/afbfillsp.c
+++ b/afb/afbfillsp.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.3 2000/11/22 00:58:12 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbfont.c b/afb/afbfont.c
index bf77825f1..940bdb09b 100644
--- a/afb/afbfont.c
+++ b/afb/afbfont.c
@@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 */
-/* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbgc.c b/afb/afbgc.c
index 6c46b3b8e..03475dda5 100644
--- a/afb/afbgc.c
+++ b/afb/afbgc.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.2 1999/06/20 15:02:46 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c
index 3cc2e2f6e..8d1db1482 100644
--- a/afb/afbgetsp.c
+++ b/afb/afbgetsp.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.0 1996/08/18 01:45:37 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c
index d7ddce1a1..8f332e6d8 100644
--- a/afb/afbhrzvert.c
+++ b/afb/afbhrzvert.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.0 1996/08/18 01:45:38 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbimage.c b/afb/afbimage.c
index a0b4270e8..c82bb3668 100644
--- a/afb/afbimage.c
+++ b/afb/afbimage.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
index 28113b448..de02aa46a 100644
--- a/afb/afbimggblt.c
+++ b/afb/afbimggblt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.1tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbline.c b/afb/afbline.c
index d3f2def89..9e2e4b9f4 100644
--- a/afb/afbline.c
+++ b/afb/afbline.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.1 1998/03/20 21:04:55 hohndel Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbmisc.c b/afb/afbmisc.c
index e5a4f492d..023c43f34 100644
--- a/afb/afbmisc.c
+++ b/afb/afbmisc.c
@@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index 72482ff7f..6801960c6 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.0 1996/08/18 01:45:45 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */
 
 /* pixmap management
    written by drewry, september 1986
diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
index b7a16e086..86ec174f4 100644
--- a/afb/afbply1rct.c
+++ b/afb/afbply1rct.c
@@ -1,6 +1,4 @@
-/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /*
- * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
  *
 Copyright (c) 1990  X Consortium
 
diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
index 7d4f5ddd7..289d50e1b 100644
--- a/afb/afbplygblt.c
+++ b/afb/afbplygblt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c
index 648a2d19c..cc43f5237 100644
--- a/afb/afbpntarea.c
+++ b/afb/afbpntarea.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.0 1996/08/18 01:45:49 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index aaa6847a9..94c96e4cf 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -1,5 +1,4 @@
 /* $XFree86$ */
-/* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
index 4e9fa0310..a9d96edfe 100644
--- a/afb/afbpolypnt.c
+++ b/afb/afbpolypnt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c
index c717f0e45..3dd548737 100644
--- a/afb/afbpushpxl.c
+++ b/afb/afbpushpxl.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.1 1998/03/20 21:04:56 hohndel Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c
index b9e0ba94f..2b0867fda 100644
--- a/afb/afbscrinit.c
+++ b/afb/afbscrinit.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.4 1998/07/25 08:50:27 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c
index 3a078ffa9..adc726620 100644
--- a/afb/afbsetsp.c
+++ b/afb/afbsetsp.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.2 2001/08/01 00:44:47 tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
index 16f6ca4ea..ba889cb80 100644
--- a/afb/afbtegblt.c
+++ b/afb/afbtegblt.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.1 1998/03/20 21:04:57 hohndel Exp $ */
-/* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbtile.c b/afb/afbtile.c
index 11d76abdf..8fcb9cde7 100644
--- a/afb/afbtile.c
+++ b/afb/afbtile.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.3tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
@@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/afb/afbwindow.c b/afb/afbwindow.c
index 90a4f7dfe..a4a1602bc 100644
--- a/afb/afbwindow.c
+++ b/afb/afbwindow.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.0 1996/08/18 01:45:58 dawes Exp $ */
-/* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c
index 0fe9244ad..2cc30687f 100644
--- a/afb/afbzerarc.c
+++ b/afb/afbzerarc.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.2 2001/10/28 03:32:59 tsi Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
@@ -26,7 +25,6 @@ in this Software without prior written authorization from the X Consortium.
 
 ********************************************************/
 
-/* $XConsortium: afbzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */
 
 /* Derived from:
  * "Algorithm for drawing ellipses or hyperbolae with a digital plotter"