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-CURRENTXACE-SELINUXDAMAGE-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).

4 files changed, 4 insertions, 4 deletions

diff --git a/dsimple.c b/dsimple.c
index cd4cbc9..8cdce02 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.7 2003/09/24 02:43:38 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/dsimple.h b/dsimple.h
index 7efd5c0..ae520aa 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
 
 /*
  * Just_display.h: This file contains the definitions needed to use the
diff --git a/xwininfo.c b/xwininfo.c
index 085dc78..2d63e13 100644
--- a/xwininfo.c
+++ b/xwininfo.c
@@ -29,7 +29,7 @@ or other dealings in this Software without prior written authorization
 of the copyright holder.
 
 */
-/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.10 2003/09/20 16:08:32 herrb Exp $ */
+/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.9 2003/09/09 22:08:25 herrb Exp $ */
 
 
 /*
diff --git a/xwininfo.man b/xwininfo.man
index 6246fe3..8493df0 100644
--- a/xwininfo.man
+++ b/xwininfo.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xwininfo/xwininfo.man,v 1.9 2004/01/12 21:43:20 herrb Exp $
+.\" $XFree86: xwininfo.man,v 1.8 2001/12/14 20:02:35 dawes Exp $
 .\"
 .TH XWININFO 1 __xorgversion__
 .SH NAME