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_900XORG-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_16XORG-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

6 files changed, 7 insertions, 6 deletions

diff --git a/Xfd.ad b/Xfd.ad
index ba64337..29ff522 100644
--- a/Xfd.ad
+++ b/Xfd.ad
@@ -2,7 +2,7 @@
 
 
 
-! $XFree86: xc/programs/xfd/Xfd.ad,v 1.3 2002/07/23 01:45:41 tsi Exp $
+! $XFree86$
 
 *internalBorderWidth: 0
 *showGrip: false
diff --git a/grid.c b/grid.c
index acae07d..f4632f2 100644
--- a/grid.c
+++ b/grid.c
@@ -1,4 +1,5 @@
 /*
+ * $XdotOrg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  * $Xorg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $
  *
  * 
@@ -26,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xfd/grid.c,v 1.10 2003/12/19 02:05:39 dawes Exp $ */
+/* $XFree86: xc/programs/xfd/grid.c,v 1.9 2002/07/06 00:46:42 keithp Exp $ */
 
 
 #include <X11/IntrinsicP.h>
diff --git a/grid.h b/grid.h
index eb9f243..2000d0f 100644
--- a/grid.h
+++ b/grid.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xfd/grid.h,v 1.5 2003/11/17 22:20:53 dawes Exp $ */
+/* $XFree86: xc/programs/xfd/grid.h,v 1.4 2002/07/23 01:45:41 tsi Exp $ */
 
 #ifndef _FontGrid_h_
 #define _FontGrid_h_
diff --git a/gridP.h b/gridP.h
index 1ed849b..9e23145 100644
--- a/gridP.h
+++ b/gridP.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xfd/gridP.h,v 1.4 2002/07/23 01:45:41 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _FontGridP_h_
 #define _FontGridP_h_
diff --git a/xfd.c b/xfd.c
index bf6f0e9..a21a0e3 100644
--- a/xfd.c
+++ b/xfd.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/programs/xfd/xfd.c,v 1.9 2003/04/19 23:49:27 herrb Exp $ */
+/* $XFree86: xc/programs/xfd/xfd.c,v 1.8 2003/02/20 02:56:40 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/xfd.man b/xfd.man
index 096e5f3..fb932a8 100644
--- a/xfd.man
+++ b/xfd.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xfd/xfd.man,v 1.10 2003/04/21 20:42:49 dawes Exp $
+.\" $XFree86: xc/programs/xfd/xfd.man,v 1.9 2003/04/19 23:49:27 herrb Exp $
 .\"
 .TH XFD 1 __xorgversion__
 .SH NAME