Merging XORG-CURRENT into trunkxprint_packagertest_20041217_basexprint_packagertest_20041125_basesco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041217xprint_packagertest_20041125sco_port_updatelg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

15 files changed, 15 insertions, 15 deletions

diff --git a/BitEdit.c b/BitEdit.c
index 235a6a2..ee850d8 100644
--- a/BitEdit.c
+++ b/BitEdit.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.7 2003/05/27 22:26:55 tsi Exp $ */
+/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.6tsi Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Bitmap-nocase.ad b/Bitmap-nocase.ad
index c819a24..cfa6b83 100644
--- a/Bitmap-nocase.ad
+++ b/Bitmap-nocase.ad
@@ -1,6 +1,6 @@
 ! $Xorg: Bitmap.ad,v 1.3 2000/08/17 19:53:49 cpqbld Exp $
 !
-! $XFree86: xc/programs/bitmap/Bitmap-nocase.ad,v 1.1 2002/05/29 21:37:42 torrey Exp $
+! $XFree86: $
 !
 ! The App-defaults file for Bitmap for use on file systems
 ! that are not case sensitive.
diff --git a/Bitmap.c b/Bitmap.c
index 43eacb2..669187c 100644
--- a/Bitmap.c
+++ b/Bitmap.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.6 2002/02/18 21:43:17 herrb Exp $ */
+/* $XFree86: Bitmap.c,v 1.5 2001/12/26 21:39:34 paulo Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Bitmap.h b/Bitmap.h
index a525089..c6166d7 100644
--- a/Bitmap.h
+++ b/Bitmap.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.5 2001/12/14 20:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.4 2001/06/12 09:45:53 alanh Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/BitmapP.h b/BitmapP.h
index 57da1a1..acd3f4a 100644
--- a/BitmapP.h
+++ b/BitmapP.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.4 2001/12/14 20:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.3 2001/01/17 23:44:51 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/CutPaste.c b/CutPaste.c
index 3a2a30f..cf0ac78 100644
--- a/CutPaste.c
+++ b/CutPaste.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/CutPaste.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */
+/* $XFree86: CutPaste.c,v 1.4 2001/12/14 20:00:40 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Dialog.c b/Dialog.c
index 1706022..03979f3 100644
--- a/Dialog.c
+++ b/Dialog.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.4 2001/12/14 20:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.3 2001/01/17 23:44:51 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Dialog.h b/Dialog.h
index 161d33f..ff70789 100644
--- a/Dialog.h
+++ b/Dialog.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.4 2001/12/14 20:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.3 2001/01/17 23:44:51 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Graphics.c b/Graphics.c
index 08ff3a0..991c753 100644
--- a/Graphics.c
+++ b/Graphics.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.6 2001/12/14 20:00:40 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.5 2001/01/17 23:44:51 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Handlers.c b/Handlers.c
index 3dc09b8..796f6fd 100644
--- a/Handlers.c
+++ b/Handlers.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Handlers.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */
+/* $XFree86: Handlers.c,v 1.4 2001/12/14 20:00:41 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/ReqMach.c b/ReqMach.c
index 4713abc..7d7328e 100644
--- a/ReqMach.c
+++ b/ReqMach.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/ReqMach.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */
+/* $XFree86: ReqMach.c,v 1.4 2001/12/14 20:00:41 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Requests.h b/Requests.h
index 3c9d33b..abc6713 100644
--- a/Requests.h
+++ b/Requests.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/Requests.h,v 1.5 2001/12/14 20:00:41 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/Requests.h,v 1.4 2001/01/17 23:44:51 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/atobm.c b/atobm.c
index b28dd73..f63a956 100644
--- a/atobm.c
+++ b/atobm.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/atobm.c,v 3.5 2001/12/14 20:00:41 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/atobm.c,v 3.4 2001/07/25 15:05:12 dawes Exp $ */
 
 /*
  * atobm - ascii to bitmap filter
diff --git a/bitmap.man b/bitmap.man
index bb5c388..afcf516 100644
--- a/bitmap.man
+++ b/bitmap.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/bitmap/bitmap.man,v 1.8 2002/10/12 16:06:44 herrb Exp $
+.\" $XFree86: xc/programs/bitmap/bitmap.man,v 1.7 2001/12/14 20:00:41 dawes Exp $
 .\"
 .TH BITMAP 1 __xorgversion__
 .SH NAME
diff --git a/bmtoa.c b/bmtoa.c
index 145ab10..39dfcf9 100644
--- a/bmtoa.c
+++ b/bmtoa.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.7 2001/12/14 20:00:41 dawes Exp $ */
+/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.6 2001/07/25 15:05:12 dawes Exp $ */
 
 /*
  * bmtoa - bitmap to ascii filter