23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTDAMAGE-XFIXES

    Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
    future conflicts on ASCII but not humal readable files. (There should
    probably be separate CreditsXorg.rtf files) (Egbert Eich).

6 files changed, 6 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 af3d190..f4632f2 100644
--- a/grid.c
+++ b/grid.c
@@ -27,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