Merging XORG-CURRENT into trunk

32 files changed, 32 insertions, 32 deletions

diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h
index cb4ee6be4..7e015ebc4 100644
--- a/ilbm/ilbm.h
+++ b/ilbm/ilbm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.2 1998/04/05 16:42:23 robin Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c
index b148bc00c..f861b93e9 100644
--- a/ilbm/ilbmbitblt.c
+++ b/ilbm/ilbmbitblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.2tsi Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c
index 455c07cb5..286a82474 100644
--- a/ilbm/ilbmblt.c
+++ b/ilbm/ilbmblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */
+/* $XFree86$ */
 /*
  * ilbm copy area
  */
diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c
index 4204c61b5..931da54fd 100644
--- a/ilbm/ilbmbres.c
+++ b/ilbm/ilbmbres.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c
index 75391e96b..1cd456bb1 100644
--- a/ilbm/ilbmbresd.c
+++ b/ilbm/ilbmbresd.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c
index 8309e2600..2a12a39bc 100644
--- a/ilbm/ilbmbstore.c
+++ b/ilbm/ilbmbstore.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmbstore.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/ilbm/ilbmclip.c b/ilbm/ilbmclip.c
index 4628e61d0..72d143e18 100644
--- a/ilbm/ilbmclip.c
+++ b/ilbm/ilbmclip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c
index 10dadd968..06da361e2 100644
--- a/ilbm/ilbmcmap.c
+++ b/ilbm/ilbmcmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.0 1996/08/18 01:53:46 dawes Exp $ */
 /* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */
 /************************************************************
 Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c
index f107e4692..28f2df91d 100644
--- a/ilbm/ilbmfillarc.c
+++ b/ilbm/ilbmfillarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.0 1996/08/18 01:53:48 dawes Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium
diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c
index 642a95f40..4c2507487 100644
--- a/ilbm/ilbmfillrct.c
+++ b/ilbm/ilbmfillrct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.0 1996/08/18 01:53:49 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c
index 5564e5142..f7fe90743 100644
--- a/ilbm/ilbmfillsp.c
+++ b/ilbm/ilbmfillsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.0 1996/08/18 01:53:50 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c
index 50cf56773..05e89bd8d 100644
--- a/ilbm/ilbmfont.c
+++ b/ilbm/ilbmfont.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c
index 8253d9cd4..259935c46 100644
--- a/ilbm/ilbmgc.c
+++ b/ilbm/ilbmgc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.0 1996/08/18 01:53:52 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c
index 727bafd39..e6adbae4a 100644
--- a/ilbm/ilbmgetsp.c
+++ b/ilbm/ilbmgetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c
index fe2638167..277ac722a 100644
--- a/ilbm/ilbmhrzvert.c
+++ b/ilbm/ilbmhrzvert.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c
index d2f7a4df9..348d593a3 100644
--- a/ilbm/ilbmimage.c
+++ b/ilbm/ilbmimage.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */
 #include <stdio.h>
 
 /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c
index 1bd6f02f9..24143fba3 100644
--- a/ilbm/ilbmimggblt.c
+++ b/ilbm/ilbmimggblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.0 1996/08/18 01:53:57 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c
index d831489c5..49dd7da46 100644
--- a/ilbm/ilbmline.c
+++ b/ilbm/ilbmline.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.0 1996/08/18 01:53:58 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c
index d85346aca..9717aceca 100644
--- a/ilbm/ilbmmisc.c
+++ b/ilbm/ilbmmisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c
index ab5a33f2a..01b991892 100644
--- a/ilbm/ilbmpixmap.c
+++ b/ilbm/ilbmpixmap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */
+/* $XFree86$ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c
index b76a29892..41d4545e4 100644
--- a/ilbm/ilbmply1rct.c
+++ b/ilbm/ilbmply1rct.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.0 1996/08/18 01:54:02 dawes Exp $ */
 /*
  * $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $
  *
diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c
index a7dca5756..fdd0a071f 100644
--- a/ilbm/ilbmplygblt.c
+++ b/ilbm/ilbmplygblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.0 1996/08/18 01:54:03 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c
index 0199b0bc6..497eb50ee 100644
--- a/ilbm/ilbmpntarea.c
+++ b/ilbm/ilbmpntarea.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c
index 5cc29e331..787955a87 100644
--- a/ilbm/ilbmpntwin.c
+++ b/ilbm/ilbmpntwin.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmpntwin.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/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c
index f313dc8d1..e35b85416 100644
--- a/ilbm/ilbmpolypnt.c
+++ b/ilbm/ilbmpolypnt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.0 1996/08/18 01:54:07 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c
index 6a045d242..5bedef851 100644
--- a/ilbm/ilbmpushpxl.c
+++ b/ilbm/ilbmpushpxl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.0 1996/08/18 01:54:08 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c
index 5a6fa71a0..f8b4eb52d 100644
--- a/ilbm/ilbmscrinit.c
+++ b/ilbm/ilbmscrinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.4 1998/07/26 01:53:45 dawes Exp $ */
 /***********************************************************
 
 Copyright (c) 1987  X Consortium
diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c
index a18cf53f8..55073817d 100644
--- a/ilbm/ilbmsetsp.c
+++ b/ilbm/ilbmsetsp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.0 1996/08/18 01:54:10 dawes Exp $ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c
index dc42baee9..2c39ef7a9 100644
--- a/ilbm/ilbmtegblt.c
+++ b/ilbm/ilbmtegblt.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.0 1996/08/18 01:54:11 dawes Exp $ */
 /* $XConsortium: ilbmtegblt.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/ilbm/ilbmtile.c b/ilbm/ilbmtile.c
index e289144ef..d6e815405 100644
--- a/ilbm/ilbmtile.c
+++ b/ilbm/ilbmtile.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */
+/* $XFree86$ */
 /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
 /***********************************************************
 
diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c
index 524972944..fbf543de4 100644
--- a/ilbm/ilbmwindow.c
+++ b/ilbm/ilbmwindow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */
+/* $XFree86$ */
 /* $XConsortium: ilbmwindow.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/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c
index 9bdf22155..9ac30e267 100644
--- a/ilbm/ilbmzerarc.c
+++ b/ilbm/ilbmzerarc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.0 1996/08/18 01:54:15 dawes Exp $ */
 /************************************************************
 
 Copyright (c) 1989  X Consortium