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-BASE

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

28 files changed, 28 insertions, 28 deletions

diff --git a/XEVI.h b/XEVI.h
index 1ac33b9..d8e37ff 100644
--- a/XEVI.h
+++ b/XEVI.h
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/include/extensions/XEVI.h,v 3.5 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XEVI_H_
 #define _XEVI_H_
diff --git a/XEVIstr.h b/XEVIstr.h
index 3d4236e..388ef4b 100644
--- a/XEVIstr.h
+++ b/XEVIstr.h
@@ -21,7 +21,7 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
-/* $XFree86: xc/include/extensions/XEVIstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _EVISTR_H_
 #define _EVISTR_H_
diff --git a/XLbx.h b/XLbx.h
index 3e498ef..01d44f0 100644
--- a/XLbx.h
+++ b/XLbx.h
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/include/extensions/XLbx.h,v 1.4 2003/11/17 22:20:02 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
  
 #ifndef _XLBX_H_
 #define _XLBX_H_
diff --git a/XShm.h b/XShm.h
index 39f48cd..4ae14ca 100644
--- a/XShm.h
+++ b/XShm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/XShm.h,v 1.12 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XShm.h,v 1.11 2003/04/03 15:11:07 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/XTest.h b/XTest.h
index 7403d20..afb1849 100644
--- a/XTest.h
+++ b/XTest.h
@@ -24,7 +24,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/include/extensions/XTest.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */
 
 #ifndef _XTEST_H_
 #define _XTEST_H_
diff --git a/Xag.h b/Xag.h
index 7372f3c..815f2b9 100644
--- a/Xag.h
+++ b/Xag.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/Xag.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
 /*
 Copyright 1996, 1998  The Open Group
 
diff --git a/Xagsrv.h b/Xagsrv.h
index 074e60a..b9c50aa 100644
--- a/Xagsrv.h
+++ b/Xagsrv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.5 2003/07/16 01:38:24 dawes Exp $ */
 /*
 Copyright 1996, 1998  The Open Group
 
diff --git a/Xagstr.h b/Xagstr.h
index 16800c7..ffb5527 100644
--- a/Xagstr.h
+++ b/Xagstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/Xagstr.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xagstr.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
 /*
 Copyright 1996, 1998, 2001  The Open Group
 
diff --git a/Xcup.h b/Xcup.h
index ef7d803..b1df039 100644
--- a/Xcup.h
+++ b/Xcup.h
@@ -24,7 +24,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/include/extensions/Xcup.h,v 3.6 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _XCUP_H_
 #define _XCUP_H_
diff --git a/Xcupstr.h b/Xcupstr.h
index d425e9c..f521c33 100644
--- a/Xcupstr.h
+++ b/Xcupstr.h
@@ -25,7 +25,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/include/extensions/Xcupstr.h,v 3.6 2001/12/14 19:53:28 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xcupstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */
 
 #ifndef _XCUPSTR_H_ /* { */
 #define _XCUPSTR_H_
diff --git a/Xdbe.h b/Xdbe.h
index 74d11d4..f9205a2 100644
--- a/Xdbe.h
+++ b/Xdbe.h
@@ -30,7 +30,7 @@
  *     Header file for Xlib-related DBE
  *
  *****************************************************************************/
-/* $XFree86: xc/include/extensions/Xdbe.h,v 3.3 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */
 
 #ifndef XDBE_H
 #define XDBE_H
diff --git a/Xext.h b/Xext.h
index f7b87d9..5b62c8b 100644
--- a/Xext.h
+++ b/Xext.h
@@ -23,7 +23,7 @@ Except as contained in this notice, the name of The Open Group shall 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/include/extensions/Xext.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xext.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
 
 #ifndef _XEXT_H_
 #define _XEXT_H_
diff --git a/dpms.h b/dpms.h
index 0e5901c..4f1d70f 100644
--- a/dpms.h
+++ b/dpms.h
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/dpms.h,v 3.5 2001/01/17 17:53:20 dawes Exp $ */
+/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */
 
 /*
  * HISTORY
diff --git a/dpmsstr.h b/dpmsstr.h
index 710960d..9386d4a 100644
--- a/dpmsstr.h
+++ b/dpmsstr.h
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/dpmsstr.h,v 3.4 2003/07/16 01:38:24 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * HISTORY
diff --git a/extutil.h b/extutil.h
index 83bc24c..825d81e 100644
--- a/extutil.h
+++ b/extutil.h
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * protocol extensions.  THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
  * ARE SUBJECT TO CHANGE!
  */
-/* $XFree86: xc/include/extensions/extutil.h,v 1.10 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/extutil.h,v 1.9 2001/12/14 19:53:28 dawes Exp $ */
 
 #ifndef _EXTUTIL_H_
 #define _EXTUTIL_H_
diff --git a/lbxbufstr.h b/lbxbufstr.h
index 9313e34..e1a06f6 100644
--- a/lbxbufstr.h
+++ b/lbxbufstr.h
@@ -22,7 +22,7 @@
  * SOFTWARE.
  * 
  */
-/* $XFree86: xc/include/extensions/lbxbufstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _BUFFERSTR_H_
 #define _BUFFERSTR_H_
diff --git a/lbximage.h b/lbximage.h
index 89d1abf..10627cf 100644
--- a/lbximage.h
+++ b/lbximage.h
@@ -25,7 +25,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/include/extensions/lbximage.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/lbximage.h,v 1.4 2001/12/20 19:28:54 tsi Exp $ */
 
 #ifndef _LBX_IMAGE_H_
 #define _LBX_IMAGE_H_
diff --git a/lbxopts.h b/lbxopts.h
index 1aff36f..02e87fd 100644
--- a/lbxopts.h
+++ b/lbxopts.h
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/include/extensions/lbxopts.h,v 1.6 2001/10/28 03:32:26 tsi Exp $ */
+/* $XFree86: xc/include/extensions/lbxopts.h,v 1.5 2001/01/17 17:53:21 dawes Exp $ */
 
 #ifndef _LBX_OPTS_H_
 #define _LBX_OPTS_H_
diff --git a/lbxstr.h b/lbxstr.h
index 77417da..5b79e36 100644
--- a/lbxstr.h
+++ b/lbxstr.h
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/include/extensions/lbxstr.h,v 1.3 2001/11/23 19:21:30 dawes Exp $ */
+/* $XFree86: xc/include/extensions/lbxstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
  
 #ifndef _LBXSTR_H_
 #define _LBXSTR_H_
diff --git a/mitmiscstr.h b/mitmiscstr.h
index 7f819bf..32cae26 100644
--- a/mitmiscstr.h
+++ b/mitmiscstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/mitmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/multibuf.h b/multibuf.h
index 8ad1be8..96b4c3b 100644
--- a/multibuf.h
+++ b/multibuf.h
@@ -24,7 +24,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/include/extensions/multibuf.h,v 3.5 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */
 
 #ifndef _MULTIBUF_H_
 #define _MULTIBUF_H_
diff --git a/multibufst.h b/multibufst.h
index aeb6632..8469a16 100644
--- a/multibufst.h
+++ b/multibufst.h
@@ -24,7 +24,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/include/extensions/multibufst.h,v 3.9 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */
 
 #ifndef _MULTIBUFST_H_
 #define _MULTIBUFST_H_
diff --git a/security.h b/security.h
index 1f6019c..188ad55 100644
--- a/security.h
+++ b/security.h
@@ -24,7 +24,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/include/extensions/security.h,v 1.4 2002/11/08 00:46:27 alanh Exp $ */
+/* $XFree86: xc/include/extensions/security.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
 
 #ifndef _SECURITY_H
 #define _SECURITY_H
diff --git a/securstr.h b/securstr.h
index 672a5cb..50c7644 100644
--- a/securstr.h
+++ b/securstr.h
@@ -24,7 +24,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/include/extensions/securstr.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
+/* $XFree86: xc/include/extensions/securstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
 
 #ifndef _SECURSTR_H
 #define _SECURSTR_H
diff --git a/shape.h b/shape.h
index b9d3f4a..1624d64 100644
--- a/shape.h
+++ b/shape.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/shape.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/shmstr.h b/shmstr.h
index a175b23..b15538d 100644
--- a/shmstr.h
+++ b/shmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/shmstr.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/sync.h b/sync.h
index a14ae47..9fbe6d7 100644
--- a/sync.h
+++ b/sync.h
@@ -48,7 +48,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/sync.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
 
 #ifndef _SYNC_H_
 #define _SYNC_H_
diff --git a/syncstr.h b/syncstr.h
index 6479bb3..4e384f2 100644
--- a/syncstr.h
+++ b/syncstr.h
@@ -48,7 +48,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/syncstr.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
 
 #ifndef _SYNCSTR_H_
 #define _SYNCSTR_H_