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/ULabel.c b/ULabel.c
index 0f4d1c3..56d5ca0 100644
--- a/ULabel.c
+++ b/ULabel.c
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.4 2003/10/24 20:38:18 tsi Exp $ */
+/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.3tsi Exp $ */
 
 /*
  * ULabel.c - UCSLabel widget
diff --git a/ULabel.h b/ULabel.h
index 5a9c620..7c7c2ed 100644
--- a/ULabel.h
+++ b/ULabel.h
@@ -47,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xfontsel/ULabel.h,v 1.1 2000/02/13 03:26:24 dawes Exp $ */
+/* $XFree86: contrib/programs/xfontsel/ULabel.h,v 1.1 1999/04/29 09:12:39 dawes Exp $ */
 
 #ifndef _XawUCSLabel_h
 #define _XawUCSLabel_h
diff --git a/ULabelP.h b/ULabelP.h
index d4f2358..81b0817 100644
--- a/ULabelP.h
+++ b/ULabelP.h
@@ -50,7 +50,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xfontsel/ULabelP.h,v 1.1 2000/02/13 03:26:24 dawes Exp $ */
+/* $XFree86: contrib/programs/xfontsel/ULabelP.h,v 1.1 1999/04/29 09:12:39 dawes Exp $ */
 
 /* 
  * ULabelP.h - Private definitions for UCSLabel widget
diff --git a/XFontSel.ad b/XFontSel.ad
index c7b20ae..73c4854 100644
--- a/XFontSel.ad
+++ b/XFontSel.ad
@@ -32,7 +32,7 @@
 !	Ralph R. Swick, Digital Equipment Corporation/M.I.T. Project Athena
 !	one weekend in November, 1989
 !
-! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.2 2001/08/13 21:46:51 dawes Exp $
+! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.1 2000/02/13 03:26:24 dawes Exp $
 
 *appDefaultsVersion:	1
 
diff --git a/xfontsel.c b/xfontsel.c
index 3993e96..c22a441 100644
--- a/xfontsel.c
+++ b/xfontsel.c
@@ -31,7 +31,7 @@ Author:	Ralph R. Swick, DEC/MIT Project Athena
 	one weekend in November, 1989
 Modified: Mark Leisher <mleisher@crl.nmsu.edu> to deal with UCS sample text.
 */
-/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.8 2003/05/27 22:27:05 tsi Exp $ */
+/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.7tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xfontsel.man b/xfontsel.man
index cc31c73..f358334 100644
--- a/xfontsel.man
+++ b/xfontsel.man
@@ -25,7 +25,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/xfontsel/xfontsel.man,v 1.4 2002/10/12 16:06:48 herrb Exp $
+.\" $XFree86: xc/programs/xfontsel/xfontsel.man,v 1.3 2001/01/27 18:21:12 dawes Exp $
 .de EX		\"Begin example
 .ne 5
 .if n .sp 1