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

28 files changed, 28 insertions, 28 deletions

diff --git a/man/DBE.man b/man/DBE.man
index 62b6992..729842e 100644
--- a/man/DBE.man
+++ b/man/DBE.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.5 2003/05/29 21:48:04 herrb Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.4 2001/01/27 18:20:19 dawes Exp $
 .\"
 .TH DBE 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XShape.man b/man/XShape.man
index c4cc541..0f3168f 100644
--- a/man/XShape.man
+++ b/man/XShape.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" X Consortium.
 .\"
-.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.4 2003/11/23 05:40:35 dawes Exp $
+.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
 .\" $XdotOrg$
 .\"
 .de ZN
diff --git a/man/XdbeAllocateBackBufferName.man b/man/XdbeAllocateBackBufferName.man
index 7d1d76d..0a5fbfd 100644
--- a/man/XdbeAllocateBackBufferName.man
+++ b/man/XdbeAllocateBackBufferName.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeAllocateBackBufferName 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeBeginIdiom.man b/man/XdbeBeginIdiom.man
index e52d11c..98ca5a5 100644
--- a/man/XdbeBeginIdiom.man
+++ b/man/XdbeBeginIdiom.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH DBE 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeDeallocateBackBufferName.man b/man/XdbeDeallocateBackBufferName.man
index f0cbd5a..98f4495 100644
--- a/man/XdbeDeallocateBackBufferName.man
+++ b/man/XdbeDeallocateBackBufferName.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeDeallocateBackBufferName 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeEndIdiom.man b/man/XdbeEndIdiom.man
index fd4e8df..5d446fb 100644
--- a/man/XdbeEndIdiom.man
+++ b/man/XdbeEndIdiom.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeEndIdiom 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeFreeVisualInfo.man b/man/XdbeFreeVisualInfo.man
index c6cdb31..41b845b 100644
--- a/man/XdbeFreeVisualInfo.man
+++ b/man/XdbeFreeVisualInfo.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeFreeVisualInfo 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeGetBackBufferAttributes.man b/man/XdbeGetBackBufferAttributes.man
index 4d40e57..9c3005e 100644
--- a/man/XdbeGetBackBufferAttributes.man
+++ b/man/XdbeGetBackBufferAttributes.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeGetBackBufferAttributes 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeGetVisualInfo.man b/man/XdbeGetVisualInfo.man
index ee77cb4..344c6ad 100644
--- a/man/XdbeGetVisualInfo.man
+++ b/man/XdbeGetVisualInfo.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.6 2001/06/26 15:13:06 herrb Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
 .\"
 .TH XdbeGetVisualInfo 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeQueryExtension.man b/man/XdbeQueryExtension.man
index 08adadc..5a58db1 100644
--- a/man/XdbeQueryExtension.man
+++ b/man/XdbeQueryExtension.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.4 2001/01/27 18:20:20 dawes Exp $
 .\"
 .TH XdbeQueryExtension 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/XdbeSwapBuffers.man b/man/XdbeSwapBuffers.man
index 4313e4c..a2582df 100644
--- a/man/XdbeSwapBuffers.man
+++ b/man/XdbeSwapBuffers.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" Hewlett-Packard Company.
 .\"
-.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.6 2003/05/29 21:48:04 herrb Exp $
+.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.5 2001/02/07 22:35:22 tsi Exp $
 .\"
 .TH XdbeSwapBuffers 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/Xevi.man b/man/Xevi.man
index efcf608..1dd6f5a 100644
--- a/man/Xevi.man
+++ b/man/Xevi.man
@@ -25,7 +25,7 @@
 .\" dealing in this Software without prior written authorization from
 .\" Silicon Graphics, Inc.
 .\"
-.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.2 2001/01/27 18:20:19 dawes Exp $
 .\"
 .TH XEVI 3X11 __xorgversion__ "X FUNCTIONS"
 .SH NAME
diff --git a/man/Xmbuf.man b/man/Xmbuf.man
index 0dd9aae..0e09d55 100644
--- a/man/Xmbuf.man
+++ b/man/Xmbuf.man
@@ -34,7 +34,7 @@
 .\" without express or implied warranty.
 .\" 
 .\"
-.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.4 2003/11/23 05:40:35 dawes Exp $
+.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
 .\" $XdotOrg$
 .\"
 .de ZN
diff --git a/src/DPMS.c b/src/DPMS.c
index 738f68d..dd00e5e 100644
--- a/src/DPMS.c
+++ b/src/DPMS.c
@@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xext/DPMS.c,v 3.6 2002/10/16 02:19:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/DPMS.c,v 3.5 2002/10/16 00:37:27 dawes Exp $ */
 
 /*
  * HISTORY
diff --git a/src/MITMisc.c b/src/MITMisc.c
index 21bb5ef..0358e0b 100644
--- a/src/MITMisc.c
+++ b/src/MITMisc.c
@@ -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/lib/Xext/MITMisc.c,v 1.4 2002/10/16 02:19:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/MITMisc.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */
 
 /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM BLESSING */
 
diff --git a/src/XAppgroup.c b/src/XAppgroup.c
index 6c98e04..16e4f4c 100644
--- a/src/XAppgroup.c
+++ b/src/XAppgroup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.12 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XAppgroup.c,v 1.11 2002/10/16 02:19:22 dawes Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
diff --git a/src/XEVI.c b/src/XEVI.c
index 16e1604..d616cc3 100644
--- a/src/XEVI.c
+++ b/src/XEVI.c
@@ -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/lib/Xext/XEVI.c,v 1.7 2002/10/16 00:37:27 dawes Exp $ */
+/* $XFree86$ */
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
diff --git a/src/XLbx.c b/src/XLbx.c
index a0a2a3a..7d85d8e 100644
--- a/src/XLbx.c
+++ b/src/XLbx.c
@@ -22,7 +22,7 @@
  *
  * Author:  Keith Packard, Network Computing Devices
  */
-/* $XFree86: xc/lib/Xext/XLbx.c,v 1.5 2002/10/16 02:19:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XLbx.c,v 1.4 2002/10/16 00:37:27 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/src/XMultibuf.c b/src/XMultibuf.c
index c12df7a..fddf83c 100644
--- a/src/XMultibuf.c
+++ b/src/XMultibuf.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Authors:  Jim Fulton, MIT X Consortium
  */
-/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.6 2002/10/16 00:37:27 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XMultibuf.c,v 1.5 2001/12/14 19:55:00 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/src/XSecurity.c b/src/XSecurity.c
index 2c94709..4842744 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -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/lib/Xext/XSecurity.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XSecurity.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
 
 #include <X11/Xlibint.h>
 #include <stdio.h>
diff --git a/src/XShape.c b/src/XShape.c
index 9ec6a78..216515b 100644
--- a/src/XShape.c
+++ b/src/XShape.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/lib/Xext/XShape.c,v 1.4 2002/10/16 02:19:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XShape.c,v 1.3 2002/10/16 00:37:27 dawes Exp $ */
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
diff --git a/src/XShm.c b/src/XShm.c
index 4e17e58..75679fa 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
  *
  * Author:  Bob Scheifler and Keith Packard, MIT X Consortium
  */
-/* $XFree86: xc/lib/Xext/XShm.c,v 1.7 2003/04/15 22:33:55 paulo Exp $ */
+/* $XFree86: xc/lib/Xext/XShm.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/src/XSync.c b/src/XSync.c
index be1efbd..c42ca07 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -50,7 +50,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xext/XSync.c,v 1.8 2003/10/23 21:36:09 tsi Exp $ */
+/* $XFree86: xc/lib/Xext/XSync.c,v 1.7tsi Exp $ */
 
 #include <stdio.h>
 #define NEED_EVENTS
diff --git a/src/XTestExt1.c b/src/XTestExt1.c
index d7c8014..9511f6e 100644
--- a/src/XTestExt1.c
+++ b/src/XTestExt1.c
@@ -51,7 +51,7 @@ Telephone and Telegraph Company or of the Regents of the
 University of California.
 
 */
-/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.4 2001/12/14 19:55:01 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/XTestExt1.c,v 1.3 2001/01/17 19:42:46 dawes Exp $ */
 
 /******************************************************************************
  * include files
diff --git a/src/Xcup.c b/src/Xcup.c
index 5abc7b0..2686f46 100644
--- a/src/Xcup.c
+++ b/src/Xcup.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xext/Xcup.c,v 1.9 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/Xcup.c,v 1.8 2002/10/16 02:19:22 dawes Exp $ */
 /*
 
 Copyright 1987, 1988, 1998  The Open Group
diff --git a/src/Xdbe.c b/src/Xdbe.c
index 77f1c96..537374f 100644
--- a/src/Xdbe.c
+++ b/src/Xdbe.c
@@ -30,7 +30,7 @@
  *     Xlib DBE code
  *
  *****************************************************************************/
-/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.8 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/Xdbe.c,v 3.7 2002/10/16 02:19:22 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/src/extutil.c b/src/extutil.c
index bf89453..162909a 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -45,7 +45,7 @@ in this Software without prior written authorization from The Open Group.
  *         XSetExtensionErrorHandler	establish an extension error handler
  *         XMissingExtension		raise an error about missing ext
  */
-/* $XFree86: xc/lib/Xext/extutil.c,v 1.6 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/extutil.c,v 1.5 2002/10/16 00:37:27 dawes Exp $ */
 
 #include <stdio.h>
 #include <X11/Xlibint.h>
diff --git a/src/globals.c b/src/globals.c
index 8ac0a24..b59d3c5 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xext/globals.c,v 3.5 2001/12/14 19:55:02 dawes Exp $ */
+/* $XFree86: xc/lib/Xext/globals.c,v 3.4 2001/07/29 05:01:12 tsi Exp $ */
 
 /*
  * This file should contain only those objects which must be predefined.