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-MERGEXORG-6_8-branch

62 files changed, 64 insertions, 64 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, 
diff --git a/src/XAllowDv.c b/src/XAllowDv.c
index d88001b..d745046 100644
--- a/src/XAllowDv.c
+++ b/src/XAllowDv.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.3 2001/12/14 19:55:03 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgDCtl.c b/src/XChgDCtl.c
index ec08db0..b1fd7a1 100644
--- a/src/XChgDCtl.c
+++ b/src/XChgDCtl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.3 2001/12/14 19:55:03 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgFCtl.c b/src/XChgFCtl.c
index 36f5893..8f4c009 100644
--- a/src/XChgFCtl.c
+++ b/src/XChgFCtl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.3 2001/12/14 19:55:03 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgKMap.c b/src/XChgKMap.c
index c698cc9..8ad77ca 100644
--- a/src/XChgKMap.c
+++ b/src/XChgKMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.3 2001/12/14 19:55:04 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgKbd.c b/src/XChgKbd.c
index c4d31ba..b3e2c06 100644
--- a/src/XChgKbd.c
+++ b/src/XChgKbd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.3 2001/12/14 19:55:04 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgPnt.c b/src/XChgPnt.c
index 78e54c2..c7248fd 100644
--- a/src/XChgPnt.c
+++ b/src/XChgPnt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.3 2001/12/14 19:55:04 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XChgProp.c b/src/XChgProp.c
index dc09621..3fa68cf 100644
--- a/src/XChgProp.c
+++ b/src/XChgProp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.3 2001/12/14 19:55:05 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XCloseDev.c b/src/XCloseDev.c
index ab6c25f..170843b 100644
--- a/src/XCloseDev.c
+++ b/src/XCloseDev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.3 2001/12/14 19:55:06 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XDevBell.c b/src/XDevBell.c
index 2184530..2b7669f 100644
--- a/src/XDevBell.c
+++ b/src/XDevBell.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.3 2001/12/14 19:55:08 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XExtInt.c b/src/XExtInt.c
index 09d1aa2..9e569df 100644
--- a/src/XExtInt.c
+++ b/src/XExtInt.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.8 2003/07/07 15:34:22 eich Exp $ */
+/* $XFree86: xc/lib/Xi/XExtInt.c,v 3.6 2001/12/14 19:55:09 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XExtToWire.c b/src/XExtToWire.c
index aefcfbb..30f0140 100644
--- a/src/XExtToWire.c
+++ b/src/XExtToWire.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.6 2002/10/16 12:56:28 tsi Exp $ */
+/* $XFree86: xc/lib/Xi/XExtToWire.c,v 3.5 2002/10/16 00:37:28 dawes Exp $ */
 
 /****************************************************************
  *
diff --git a/src/XFreeLst.c b/src/XFreeLst.c
index 067a819..3966f3f 100644
--- a/src/XFreeLst.c
+++ b/src/XFreeLst.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XFreeLst.c,v 1.3 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/src/XGMotion.c b/src/XGMotion.c
index e065b33..4ce41bf 100644
--- a/src/XGMotion.c
+++ b/src/XGMotion.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.3 2001/12/14 19:55:12 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetBMap.c b/src/XGetBMap.c
index fa5eab6..1c1658f 100644
--- a/src/XGetBMap.c
+++ b/src/XGetBMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.3 2001/12/14 19:55:13 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c
index 2f060b0..66b3525 100644
--- a/src/XGetDCtl.c
+++ b/src/XGetDCtl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.3 2001/12/14 19:55:13 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c
index d8c3407..e34c7ce 100644
--- a/src/XGetFCtl.c
+++ b/src/XGetFCtl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.3 2001/12/14 19:55:14 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetKMap.c b/src/XGetKMap.c
index fd14050..c794006 100644
--- a/src/XGetKMap.c
+++ b/src/XGetKMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.5 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetMMap.c b/src/XGetMMap.c
index 4207676..04e89d8 100644
--- a/src/XGetMMap.c
+++ b/src/XGetMMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.3 2001/12/14 19:55:16 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGetProp.c b/src/XGetProp.c
index 8eeb1b0..ed5a2d1 100644
--- a/src/XGetProp.c
+++ b/src/XGetProp.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.3 2001/12/14 19:55:17 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -93,7 +93,7 @@ XEventClass
     if (*count)
 	{
 	rlen = rep.length << 2;
-	list = (XEventClass *) Xmalloc (rlen);
+	list = (XEventClass *) Xmalloc (rep.length * sizeof(XEventClass));
 	if (list)
 	    {
 		int i;
diff --git a/src/XGetVers.c b/src/XGetVers.c
index fa8cf7f..3180837 100644
--- a/src/XGetVers.c
+++ b/src/XGetVers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.6 2003/07/08 15:39:47 tsi Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGrDvBut.c b/src/XGrDvBut.c
index 34a3fa1..48381f8 100644
--- a/src/XGrDvBut.c
+++ b/src/XGrDvBut.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.4 2001/12/14 19:55:17 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGrDvKey.c b/src/XGrDvKey.c
index 437684c..94e9ba4 100644
--- a/src/XGrDvKey.c
+++ b/src/XGrDvKey.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.3 2001/12/14 19:55:17 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGrabDev.c b/src/XGrabDev.c
index 8b953bf..f49a6bd 100644
--- a/src/XGrabDev.c
+++ b/src/XGrabDev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.3 2001/12/14 19:55:17 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGtFocus.c b/src/XGtFocus.c
index 0b8ef56..29e8de7 100644
--- a/src/XGtFocus.c
+++ b/src/XGtFocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.3 2001/12/14 19:55:18 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XGtSelect.c b/src/XGtSelect.c
index f1c72d0..9663653 100644
--- a/src/XGtSelect.c
+++ b/src/XGtSelect.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.3 2001/12/14 19:55:19 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XIint.h b/src/XIint.h
index 8dfe80a..fdca57d 100644
--- a/src/XIint.h
+++ b/src/XIint.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/Xi/XIint.h,v 3.3 2003/11/17 22:20:22 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XIint.h,v 3.2 2003/07/07 15:34:22 eich Exp $ */
 
 /*
  *	XIint.h - Header definition and support file for the internal
diff --git a/src/XListDev.c b/src/XListDev.c
index 71e63ce..279bede 100644
--- a/src/XListDev.c
+++ b/src/XListDev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XListDev.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XListDev.c,v 3.4 2001/12/14 19:55:19 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XOpenDev.c b/src/XOpenDev.c
index 3439882..7930a9a 100644
--- a/src/XOpenDev.c
+++ b/src/XOpenDev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.3 2001/12/14 19:55:20 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XQueryDv.c b/src/XQueryDv.c
index 186310c..1450c15 100644
--- a/src/XQueryDv.c
+++ b/src/XQueryDv.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.3 2001/12/14 19:55:20 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XSelect.c b/src/XSelect.c
index 6bef46a..c0a8dc8 100644
--- a/src/XSelect.c
+++ b/src/XSelect.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSelect.c,v 3.3 2001/12/14 19:55:21 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -86,7 +86,7 @@ XSelectExtensionEvent (dpy, w, event_list, count)
        statement */
 
     count <<= 2;
-    Data (dpy, (char *) event_list, count);
+    Data32 (dpy, (long *) event_list, count);
 
     UnlockDisplay(dpy);
     SyncHandle();
diff --git a/src/XSetBMap.c b/src/XSetBMap.c
index 34139f2..716d8c5 100644
--- a/src/XSetBMap.c
+++ b/src/XSetBMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.3 2001/12/14 19:55:21 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XSetDVal.c b/src/XSetDVal.c
index 64da6c4..3cee1a9 100644
--- a/src/XSetDVal.c
+++ b/src/XSetDVal.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.3 2001/12/14 19:55:22 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XSetMMap.c b/src/XSetMMap.c
index b377cd2..d31197c 100644
--- a/src/XSetMMap.c
+++ b/src/XSetMMap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.3 2001/12/14 19:55:22 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XSetMode.c b/src/XSetMode.c
index 85eb815..5f62fb1 100644
--- a/src/XSetMode.c
+++ b/src/XSetMode.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.3 2001/12/14 19:55:23 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XSndExEv.c b/src/XSndExEv.c
index 55626d0..28b654b 100644
--- a/src/XSndExEv.c
+++ b/src/XSndExEv.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XSndExEv.c,v 3.3 2001/12/14 19:55:23 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XStFocus.c b/src/XStFocus.c
index 5b232e7..fc61896 100644
--- a/src/XStFocus.c
+++ b/src/XStFocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.3 2001/12/14 19:55:23 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XUngrDev.c b/src/XUngrDev.c
index ef77c64..e3aec36 100644
--- a/src/XUngrDev.c
+++ b/src/XUngrDev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.3 2001/12/14 19:55:23 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XUngrDvB.c b/src/XUngrDvB.c
index 1f2134d..7e96665 100644
--- a/src/XUngrDvB.c
+++ b/src/XUngrDvB.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.3 2001/12/14 19:55:25 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/XUngrDvK.c b/src/XUngrDvK.c
index 90c4063..26a5841 100644
--- a/src/XUngrDvK.c
+++ b/src/XUngrDvK.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */
+/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.3 2001/12/14 19:55:26 dawes Exp $ */
 
 /***********************************************************************
  *