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

9 files changed, 9 insertions, 9 deletions

diff --git a/cfgparse.y b/cfgparse.y
index ca995f0..05632df 100644
--- a/cfgparse.y
+++ b/cfgparse.y
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.5 2002/10/16 04:53:17 tsi Exp $ */
+/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.4tsi Exp $ */
 
 %token
 	END_OF_FILE	0
diff --git a/cfgscan.c b/cfgscan.c
index d826548..6eaef0c 100644
--- a/cfgscan.c
+++ b/cfgscan.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.7 2001/08/01 00:45:05 tsi Exp $ */
+/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.6 2001/01/17 23:46:07 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/evargs.c b/evargs.c
index 0cdb9f9..44b8242 100644
--- a/evargs.c
+++ b/evargs.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.4 2001/01/17 23:46:08 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.3 1999/03/02 11:49:59 dawes Exp $ */
 
 #define	DEBUG_VAR evargsDebug
 #include "xkbevd.h"
diff --git a/printev.c b/printev.c
index 0b6b27a..1aec0aa 100644
--- a/printev.c
+++ b/printev.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/printev.c,v 3.4 2001/01/17 23:46:08 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/printev.c,v 3.3 1999/03/02 11:49:59 dawes Exp $ */
 
 #define	DEBUG_VAR printevDebug
 #include "xkbevd.h"
diff --git a/utils.c b/utils.c
index bdb15ae..4c81e3f 100644
--- a/utils.c
+++ b/utils.c
@@ -1,6 +1,6 @@
 
   /*\
-   * $XFree86: xc/programs/xkbevd/utils.c,v 3.6 2002/01/14 18:30:11 dawes Exp $
+   * $XFree86: xc/programs/xkbevd/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $
    *
    *		              COPYRIGHT 1990
    *		        DIGITAL EQUIPMENT CORPORATION
diff --git a/utils.h b/utils.h
index 83e690c..70d3ca4 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/xkbevd/utils.h,v 1.7 2003/11/17 22:20:53 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/utils.h,v 1.6 2002/01/14 18:30:11 dawes Exp $ */
 
 /***====================================================================***/
 
diff --git a/xkbevd.c b/xkbevd.c
index 30149ea..36fd809 100644
--- a/xkbevd.c
+++ b/xkbevd.c
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.9 2001/07/25 15:05:25 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.8 2001/01/17 23:46:09 dawes Exp $ */
 
 #define	DEBUG_VAR xkbevdDebug
 #include <X11/Xosdefs.h>
diff --git a/xkbevd.h b/xkbevd.h
index 1ef705f..f7e9241 100644
--- a/xkbevd.h
+++ b/xkbevd.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.5 2003/11/17 22:20:53 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.4 2001/01/17 23:46:09 dawes Exp $ */
 
 #ifndef XKBEVD_H
 #define	XKBEVD_H 1
diff --git a/xkbevd.man b/xkbevd.man
index d5d6562..812800a 100644
--- a/xkbevd.man
+++ b/xkbevd.man
@@ -1,6 +1,6 @@
 .\" $Xorg: xkbevd.man,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
 .\"
-.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.8 2003/05/29 21:48:12 herrb Exp $
+.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
 .\"
 .TH XKBCOMP 1 __xorgversion__
 .SH NAME