23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).

20 files changed, 20 insertions, 20 deletions

diff --git a/include/X11/fonts/FSlib.h b/include/X11/fonts/FSlib.h
index 50bdbbe..c2719f8 100644
--- a/include/X11/fonts/FSlib.h
+++ b/include/X11/fonts/FSlib.h
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSlib.h,v 1.7 2001/12/19 21:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSlib.h,v 1.6 2001/12/14 19:53:33 dawes Exp $ */
 
 /*
 
diff --git a/src/FSClServ.c b/src/FSClServ.c
index e5a36a3..704eaac 100644
--- a/src/FSClServ.c
+++ b/src/FSClServ.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSClServ.c,v 1.5 2001/12/14 19:53:32 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSClServ.c,v 1.4 2001/01/17 19:41:27 dawes Exp $ */
 
 /*
 
diff --git a/src/FSConnServ.c b/src/FSConnServ.c
index 8de4f2e..6d66dbe 100644
--- a/src/FSConnServ.c
+++ b/src/FSConnServ.c
@@ -50,7 +50,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/lib/FS/FSConnServ.c,v 3.11 2001/12/14 19:53:32 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.10 2001/10/28 03:32:27 tsi Exp $ */
 
 #include	<stdio.h>
 #include	"FSlibint.h"
diff --git a/src/FSErrHndlr.c b/src/FSErrHndlr.c
index 40fcccd..2440c4f 100644
--- a/src/FSErrHndlr.c
+++ b/src/FSErrHndlr.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
 */
-/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.5 2001/12/14 19:53:32 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
 
 /*
 
diff --git a/src/FSFontInfo.c b/src/FSFontInfo.c
index 277d00e..233453a 100644
--- a/src/FSFontInfo.c
+++ b/src/FSFontInfo.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSFontInfo.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSFontInfo.c,v 1.5tsi Exp $ */
 
 /*
 
diff --git a/src/FSFtNames.c b/src/FSFtNames.c
index e3ad30d..d657181 100644
--- a/src/FSFtNames.c
+++ b/src/FSFtNames.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSFtNames.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSFtNames.c,v 1.6tsi Exp $ */
 
 /*
 
diff --git a/src/FSGetCats.c b/src/FSGetCats.c
index 5516d1b..99f931f 100644
--- a/src/FSGetCats.c
+++ b/src/FSGetCats.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSGetCats.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSGetCats.c,v 1.6tsi Exp $ */
 
 /*
 
diff --git a/src/FSListCats.c b/src/FSListCats.c
index e276a4b..4ab3d20 100644
--- a/src/FSListCats.c
+++ b/src/FSListCats.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSListCats.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSListCats.c,v 1.6tsi Exp $ */
 
 /*
 
diff --git a/src/FSListExt.c b/src/FSListExt.c
index 91e9639..31ca9ed 100644
--- a/src/FSListExt.c
+++ b/src/FSListExt.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSListExt.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSListExt.c,v 1.6tsi Exp $ */
 
 /*
 
diff --git a/src/FSOpenFont.c b/src/FSOpenFont.c
index d87c5f9..4badef7 100644
--- a/src/FSOpenFont.c
+++ b/src/FSOpenFont.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.6tsi Exp $ */
 
 /*
 
diff --git a/src/FSOpenServ.c b/src/FSOpenServ.c
index b364bf2..8a3a103 100644
--- a/src/FSOpenServ.c
+++ b/src/FSOpenServ.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.9 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.8tsi Exp $ */
 
 /*
 
diff --git a/src/FSQGlyphs.c b/src/FSQGlyphs.c
index 187ea16..ab1cb75 100644
--- a/src/FSQGlyphs.c
+++ b/src/FSQGlyphs.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSQGlyphs.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSQGlyphs.c,v 1.5tsi Exp $ */
 
 /*
 
diff --git a/src/FSQXExt.c b/src/FSQXExt.c
index 5f23774..38f1095 100644
--- a/src/FSQXExt.c
+++ b/src/FSQXExt.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.8 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.7tsi Exp $ */
 
 /*
 
diff --git a/src/FSQXInfo.c b/src/FSQXInfo.c
index 953e6fc..90ae387 100644
--- a/src/FSQXInfo.c
+++ b/src/FSQXInfo.c
@@ -23,7 +23,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSQXInfo.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSQXInfo.c,v 1.5tsi Exp $ */
 
 /*
 
diff --git a/src/FSServName.c b/src/FSServName.c
index 43f806d..f9fa3ea 100644
--- a/src/FSServName.c
+++ b/src/FSServName.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSServName.c,v 1.4 2001/12/14 19:53:33 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSServName.c,v 1.3 2001/07/29 05:01:11 tsi Exp $ */
 
 /*
 
diff --git a/src/FSSetCats.c b/src/FSSetCats.c
index e73133f..5136478 100644
--- a/src/FSSetCats.c
+++ b/src/FSSetCats.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.5 2001/12/14 19:53:33 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
 
 /*
 
diff --git a/src/FSSynchro.c b/src/FSSynchro.c
index 884cfd3..2520971 100644
--- a/src/FSSynchro.c
+++ b/src/FSSynchro.c
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS 
  * SOFTWARE.
  */
-/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.5 2001/12/14 19:53:33 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.4 2001/01/17 19:41:28 dawes Exp $ */
 
 /*
 
diff --git a/src/FSlibInt.c b/src/FSlibInt.c
index bf63794..70167bd 100644
--- a/src/FSlibInt.c
+++ b/src/FSlibInt.c
@@ -50,7 +50,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/lib/FS/FSlibInt.c,v 3.11 2003/05/23 14:38:26 tsi Exp $ */
+/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.10tsi Exp $ */
 
 /*
  *	FSlibInt.c - Internal support routines for the C subroutine
diff --git a/src/FSlibint.h b/src/FSlibint.h
index 18d0d24..3299acf 100644
--- a/src/FSlibint.h
+++ b/src/FSlibint.h
@@ -50,7 +50,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/lib/FS/FSlibint.h,v 3.9 2003/09/01 20:50:09 herrb Exp $ */
+/* $XFree86: xc/lib/FS/FSlibint.h,v 3.8 2003/08/29 18:01:12 herrb Exp $ */
 
 /*
  * FSlib internal decls
diff --git a/src/FSlibos.h b/src/FSlibos.h
index c164b83..9113817 100644
--- a/src/FSlibos.h
+++ b/src/FSlibos.h
@@ -51,7 +51,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/lib/FS/FSlibos.h,v 3.11 2003/12/19 02:05:37 dawes Exp $ */
+/* $XFree86: xc/lib/FS/FSlibos.h,v 3.10 2003/09/01 20:50:10 herrb Exp $ */
 
 /*
  * FSlib networking & os include file