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

6 files changed, 6 insertions, 6 deletions

diff --git a/psgeom.c b/psgeom.c
index 40f2172..cfb3ab5 100644
--- a/psgeom.c
+++ b/psgeom.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbprint/psgeom.c,v 1.6 2003/04/22 14:01:49 pascal Exp $ */
+/* $XFree86: xc/programs/xkbprint/psgeom.c,v 1.5 2001/07/25 15:05:25 dawes Exp $ */
 
 #define	XK_TECHNICAL
 #define	XK_PUBLISHING
diff --git a/utils.c b/utils.c
index 4c44fdc..c79753d 100644
--- a/utils.c
+++ b/utils.c
@@ -25,7 +25,7 @@
    * used in advertising or publicity pertaining to distribution of the 
    * software without specific, written prior permission.
   \*/
-/* $XFree86: xc/programs/xkbprint/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $ */
+/* $XFree86: xc/programs/xkbprint/utils.c,v 3.4 2001/01/17 23:46:11 dawes Exp $ */
 
 #include 	"utils.h"
 #include	<ctype.h>
diff --git a/utils.h b/utils.h
index b675d06..63a7681 100644
--- a/utils.h
+++ b/utils.h
@@ -27,7 +27,7 @@
    * used in advertising or publicity pertaining to distribution of the 
    * software without specific, written prior permission.
   \*/
-/* $XFree86: xc/programs/xkbprint/utils.h,v 1.6 2003/11/17 22:20:53 dawes Exp $ */
+/* $XFree86: xc/programs/xkbprint/utils.h,v 1.5 2001/07/25 15:05:25 dawes Exp $ */
 
 /***====================================================================***/
 
diff --git a/xkbprint.c b/xkbprint.c
index 4862a81..81e85e5 100644
--- a/xkbprint.c
+++ b/xkbprint.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.11 2003/09/24 02:43:38 dawes Exp $ */
+/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.10 2003/05/27 22:27:07 tsi Exp $ */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/xkbprint.h b/xkbprint.h
index 32b09ab..c565570 100644
--- a/xkbprint.h
+++ b/xkbprint.h
@@ -27,7 +27,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbprint/xkbprint.h,v 1.2 2003/11/17 22:20:53 dawes Exp $ */
+/* $XFree86$ */
 
 #define	LABEL_AUTO	-1
 #define	LABEL_NONE	0
diff --git a/xkbprint.man b/xkbprint.man
index 2fcbbbb..fefbdc7 100644
--- a/xkbprint.man
+++ b/xkbprint.man
@@ -1,6 +1,6 @@
 .\" $Xorg: xkbprint.man,v 1.3 2000/08/17 19:54:50 cpqbld Exp $
 .\"
-.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.8 2003/05/29 21:48:12 herrb Exp $
+.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
 .\"
 .TH XKBPRINT 1 __xorgversion__
 .SH NAME