Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-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-MERGEsco_port_updatelg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

23 files changed, 23 insertions, 23 deletions

diff --git a/man/XAllowDeviceEvents.man b/man/XAllowDeviceEvents.man
index a1f4ce6..f5f7bae 100644
--- a/man/XAllowDeviceEvents.man
+++ b/man/XAllowDeviceEvents.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XChangeDeviceDontPropagateList.man b/man/XChangeDeviceDontPropagateList.man
index fe89f02..2207077 100644
--- a/man/XChangeDeviceDontPropagateList.man
+++ b/man/XChangeDeviceDontPropagateList.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XChangeKeyboardDevice.man b/man/XChangeKeyboardDevice.man
index 643422f..523abbd 100644
--- a/man/XChangeKeyboardDevice.man
+++ b/man/XChangeKeyboardDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XChangePointerDevice.man b/man/XChangePointerDevice.man
index 759dfa2..da0b37c 100644
--- a/man/XChangePointerDevice.man
+++ b/man/XChangePointerDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XDeviceBell.man b/man/XDeviceBell.man
index 8556704..30a89c7 100644
--- a/man/XDeviceBell.man
+++ b/man/XDeviceBell.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetDeviceControl.man b/man/XGetDeviceControl.man
index bff45d3..e605b2d 100644
--- a/man/XGetDeviceControl.man
+++ b/man/XGetDeviceControl.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetDeviceKeyMapping.man b/man/XGetDeviceKeyMapping.man
index 3bd0d66..1eef30c 100644
--- a/man/XGetDeviceKeyMapping.man
+++ b/man/XGetDeviceKeyMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetDeviceModifierMapping.man b/man/XGetDeviceModifierMapping.man
index 50b5b67..7de4fe1 100644
--- a/man/XGetDeviceModifierMapping.man
+++ b/man/XGetDeviceModifierMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetDeviceMotionEvents.man b/man/XGetDeviceMotionEvents.man
index 369c279..4b80fd9 100644
--- a/man/XGetDeviceMotionEvents.man
+++ b/man/XGetDeviceMotionEvents.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetExtensionVersion.man b/man/XGetExtensionVersion.man
index 49eed2e..9d9768f 100644
--- a/man/XGetExtensionVersion.man
+++ b/man/XGetExtensionVersion.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGetFeedbackControl.man b/man/XGetFeedbackControl.man
index cff6c8c..5de0c7a 100644
--- a/man/XGetFeedbackControl.man
+++ b/man/XGetFeedbackControl.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.3 2003/04/28 22:18:14 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.2 2001/01/27 18:20:20 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGrabDevice.man b/man/XGrabDevice.man
index e39bc0e..f8a922e 100644
--- a/man/XGrabDevice.man
+++ b/man/XGrabDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGrabDeviceButton.man b/man/XGrabDeviceButton.man
index 1de8ae7..d85c06d 100644
--- a/man/XGrabDeviceButton.man
+++ b/man/XGrabDeviceButton.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XGrabDeviceKey.man b/man/XGrabDeviceKey.man
index 138f06b..6170ba8 100644
--- a/man/XGrabDeviceKey.man
+++ b/man/XGrabDeviceKey.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XListInputDevices.man b/man/XListInputDevices.man
index 794b3fc..e0f06c5 100644
--- a/man/XListInputDevices.man
+++ b/man/XListInputDevices.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XOpenDevice.man b/man/XOpenDevice.man
index 2500bc9..0dc1500 100644
--- a/man/XOpenDevice.man
+++ b/man/XOpenDevice.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XQueryDeviceState.man b/man/XQueryDeviceState.man
index 9b6ca99..f850216 100644
--- a/man/XQueryDeviceState.man
+++ b/man/XQueryDeviceState.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSelectExtensionEvent.man b/man/XSelectExtensionEvent.man
index 543d83e..d394cf0 100644
--- a/man/XSelectExtensionEvent.man
+++ b/man/XSelectExtensionEvent.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSelExtEv.man,v 1.2 2001/01/27 18:20:22 dawes Exp $
+.\" $XFree86$
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSendExtensionEvent.man b/man/XSendExtensionEvent.man
index 487c97c..34fa904 100644
--- a/man/XSendExtensionEvent.man
+++ b/man/XSendExtensionEvent.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.4 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.3 2001/02/09 03:47:49 tsi Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSetDeviceButtonMapping.man b/man/XSetDeviceButtonMapping.man
index 8ed8a3e..6e63b53 100644
--- a/man/XSetDeviceButtonMapping.man
+++ b/man/XSetDeviceButtonMapping.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.3 2003/04/28 22:18:15 herrb Exp $
+.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSetDeviceFocus.man b/man/XSetDeviceFocus.man
index e4233ff..c313af3 100644
--- a/man/XSetDeviceFocus.man
+++ b/man/XSetDeviceFocus.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSeDvFoc.man,v 1.2 2001/01/27 18:20:21 dawes Exp $
+.\" $XFree86$
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSetDeviceMode.man b/man/XSetDeviceMode.man
index 52daa62..5695948 100644
--- a/man/XSetDeviceMode.man
+++ b/man/XSetDeviceMode.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSetMode.man,v 1.2 2001/01/27 18:20:22 dawes Exp $
+.\" $XFree86$
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, 
diff --git a/man/XSetDeviceValuators.man b/man/XSetDeviceValuators.man
index 7ccd5d3..b926e2d 100644
--- a/man/XSetDeviceValuators.man
+++ b/man/XSetDeviceValuators.man
@@ -1,5 +1,5 @@
 .\"
-.\" $XFree86: xc/doc/man/Xi/XSetDVal.man,v 1.2 2001/01/27 18:20:22 dawes Exp $
+.\" $XFree86$
 .\"
 .\"
 .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer,