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

7 files changed, 7 insertions, 7 deletions

diff --git a/Logo.c b/Logo.c
index a9b614e..0ef8752 100644
--- a/Logo.c
+++ b/Logo.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/Logo.c,v 1.7 2003/12/19 02:05:40 dawes Exp $ */
+/* $XFree86: xc/programs/xlogo/Logo.c,v 1.6 2002/05/23 23:53:59 keithp Exp $ */
 
 #include <X11/StringDefs.h>
 #include <X11/IntrinsicP.h>
diff --git a/Logo.h b/Logo.h
index 601591a..c8c29fb 100644
--- a/Logo.h
+++ b/Logo.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/Logo.h,v 1.4 2002/07/01 02:26:04 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _XawLogo_h
 #define _XawLogo_h
diff --git a/LogoP.h b/LogoP.h
index eda21c2..e86c52c 100644
--- a/LogoP.h
+++ b/LogoP.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/LogoP.h,v 1.4 2002/07/01 02:26:04 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _XawLogoP_h
 #define _XawLogoP_h
diff --git a/RenderLogo.c b/RenderLogo.c
index d99a702..2075f85 100644
--- a/RenderLogo.c
+++ b/RenderLogo.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.4 2003/05/29 15:20:57 tsi Exp $ */
+/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.3tsi Exp $ */
 
 #include <stdio.h>
 
diff --git a/RenderLogo.h b/RenderLogo.h
index 4d6b8cb..e695d77 100644
--- a/RenderLogo.h
+++ b/RenderLogo.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlogo/RenderLogo.h,v 1.2 2002/07/01 02:26:04 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _RenderLogo_h
 #define _RenderLogo_h
diff --git a/xlogo.c b/xlogo.c
index 7e6c77f..49cf369 100644
--- a/xlogo.c
+++ b/xlogo.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  */
 
-/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.9 2002/05/23 23:53:59 keithp Exp $ */
+/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Intrinsic.h>
diff --git a/xlogo.man b/xlogo.man
index d043ac9..df5ca66 100644
--- a/xlogo.man
+++ b/xlogo.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.11 2003/05/24 15:26:19 herrb Exp $
+.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.10 2002/10/12 16:06:48 herrb Exp $
 .\"
 .TH XLOGO 1 __xorgversion__
 .SH NAME