Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

13 files changed, 15 insertions, 13 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 7e3a03d..0f3168f 100644
--- a/man/XShape.man
+++ b/man/XShape.man
@@ -25,7 +25,8 @@
 .\" 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
 .ie t \fB\^\\$1\^\fR\\$2
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 45c8897..0e09d55 100644
--- a/man/Xmbuf.man
+++ b/man/Xmbuf.man
@@ -34,7 +34,8 @@
 .\" 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
 .ie t \fB\^\\$1\^\fR\\$2