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

7 files changed, 7 insertions, 7 deletions

diff --git a/io.c b/io.c
index 7660a0f..5f1e051 100644
--- a/io.c
+++ b/io.c
@@ -29,7 +29,7 @@ authorization from The Open Group.
 X Window System is a trademark of The Open Group.
 
 */
-/* $XFree86: xc/programs/xfwp/io.c,v 1.11 2001/12/14 20:01:43 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/io.c,v 1.10 2001/07/25 15:05:22 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/misc.c b/misc.c
index 91496bf..cc040ba 100644
--- a/misc.c
+++ b/misc.c
@@ -28,7 +28,7 @@ authorization from The Open Group.
 
 X Window System is a trademark of The Open Group.
 */
-/* $XFree86: xc/programs/xfwp/misc.c,v 1.7 2001/12/14 20:01:43 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/misc.c,v 1.6 2001/01/17 23:45:34 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pm.c b/pm.c
index f5cc3d1..5f2297e 100644
--- a/pm.c
+++ b/pm.c
@@ -29,7 +29,7 @@ authorization from The Open Group.
 X Window System is a trademark of The Open Group.
 
 */
-/* $XFree86: xc/programs/xfwp/pm.c,v 1.9 2003/05/27 22:27:06 tsi Exp $ */
+/* $XFree86: xc/programs/xfwp/pm.c,v 1.8tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/pm.h b/pm.h
index a886625..5214b9d 100644
--- a/pm.h
+++ b/pm.h
@@ -29,7 +29,7 @@ authorization from The Open Group.
 X Window System is a trademark of The Open Group.
 
 */
-/* $XFree86: xc/programs/xfwp/pm.h,v 1.5 2001/12/14 20:01:43 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/pm.h,v 1.4 2001/01/17 23:45:34 dawes Exp $ */
 
 #ifndef _PM_H
 #define _PM_H
diff --git a/transport.c b/transport.c
index 6def508..e01ea08 100644
--- a/transport.c
+++ b/transport.c
@@ -29,7 +29,7 @@ authorization from The Open Group.
 X Window System is a trademark of The Open Group.
 
 */
-/* $XFree86: xc/programs/xfwp/transport.c,v 1.7 2001/12/14 20:01:43 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/transport.c,v 1.6 2001/07/29 21:23:20 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xfwp.h b/xfwp.h
index 13ffe7b..fa2f240 100644
--- a/xfwp.h
+++ b/xfwp.h
@@ -25,7 +25,7 @@ not be 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/xfwp/xfwp.h,v 1.10 2001/12/14 20:01:44 dawes Exp $ */
+/* $XFree86: xc/programs/xfwp/xfwp.h,v 1.9 2001/01/17 23:45:35 dawes Exp $ */
 
 #ifndef _XFWP_H
 #define _XFWP_H
diff --git a/xfwp.man b/xfwp.man
index 3bf2c94..daee38d 100644
--- a/xfwp.man
+++ b/xfwp.man
@@ -24,7 +24,7 @@
 .\" from The Open Group.
 .\" 
 .\"
-.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.8 2001/12/14 20:01:44 dawes Exp $
+.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.7 2001/02/07 22:35:23 tsi Exp $
 .\"
 .nh
 .TH XFWP 1 __xorgversion__