Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004

74 files changed, 74 insertions, 74 deletions

diff --git a/Xi/allowev.c b/Xi/allowev.c
index 2eb463d41..c74bdba04 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/allowev.h b/Xi/allowev.h
index 0202b2cf5..355f09329 100644
--- a/Xi/allowev.h
+++ b/Xi/allowev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/allowev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index f5988d76b..e988a825f 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h
index 0d15001a0..548ea8a83 100644
--- a/Xi/chgdctl.h
+++ b/Xi/chgdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 213fc7bf5..c435bda1d 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h
index 4f833617a..47ec80a42 100644
--- a/Xi/chgfctl.h
+++ b/Xi/chgfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index b0b82ee6d..cdc9c4d95 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h
index 5a2cef2c7..63ae5eecb 100644
--- a/Xi/chgkbd.h
+++ b/Xi/chgkbd.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkbd.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 2b638252f..f5068431d 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h
index fd7ed4673..629535974 100644
--- a/Xi/chgkmap.h
+++ b/Xi/chgkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 96ce0bebe..08c2a05c6 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/chgprop.h b/Xi/chgprop.h
index 9df05b4d0..0b202140c 100644
--- a/Xi/chgprop.h
+++ b/Xi/chgprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index c6ece1d65..8305f7968 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/chgptr.h b/Xi/chgptr.h
index 3168e9710..92a5a29a0 100644
--- a/Xi/chgptr.h
+++ b/Xi/chgptr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 1f7e7dbd2..009380f67 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/closedev.h b/Xi/closedev.h
index 0295b2c8f..89dfe5fad 100644
--- a/Xi/closedev.h
+++ b/Xi/closedev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/closedev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 98520ec1c..809ad6ace 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/devbell.h b/Xi/devbell.h
index bbf6dea92..ccfe9e4f9 100644
--- a/Xi/devbell.h
+++ b/Xi/devbell.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/devbell.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index d2b2fb58c..187fcba7f 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -44,7 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/exglobals.h b/Xi/exglobals.h
index f07618b84..5f6714bfa 100644
--- a/Xi/exglobals.h
+++ b/Xi/exglobals.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/exglobals.h,v 3.3 1998/12/05 14:39:57 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 01d51ba64..baeab9d61 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index fb22a1422..bd7545fa5 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/getbmap.h b/Xi/getbmap.h
index 999a7c9f9..ed71e69b1 100644
--- a/Xi/getbmap.h
+++ b/Xi/getbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 5b24bffbe..3b4c670a2 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/getdctl.h b/Xi/getdctl.h
index 0318b4387..2519e129d 100644
--- a/Xi/getdctl.h
+++ b/Xi/getdctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getdctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 59c2c122b..1fd1cfed9 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/getfctl.h b/Xi/getfctl.h
index 6ba96b066..ed31a4254 100644
--- a/Xi/getfctl.h
+++ b/Xi/getfctl.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfctl.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 2b916da11..792997ea9 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/getfocus.h b/Xi/getfocus.h
index d3df5ba5f..fb3857ad6 100644
--- a/Xi/getfocus.h
+++ b/Xi/getfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 4a7a7e296..d820d5b5b 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/getkmap.h b/Xi/getkmap.h
index ebd02f3ef..706569cdc 100644
--- a/Xi/getkmap.h
+++ b/Xi/getkmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getkmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 67e36b442..c840bddd6 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/getmmap.h b/Xi/getmmap.h
index ff317e0c4..9c3306e0b 100644
--- a/Xi/getmmap.h
+++ b/Xi/getmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getprop.c b/Xi/getprop.c
index a3f3226ea..8134e78f9 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/getprop.h b/Xi/getprop.h
index 452875bd9..633f403be 100644
--- a/Xi/getprop.h
+++ b/Xi/getprop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getprop.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 75b9137a6..42c61a378 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
diff --git a/Xi/getselev.h b/Xi/getselev.h
index 5ed759c29..fa04695fc 100644
--- a/Xi/getselev.h
+++ b/Xi/getselev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getselev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/getvers.c b/Xi/getvers.c
index c220b5a81..08a18fe2a 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/getvers.h b/Xi/getvers.h
index 2304c6639..9184ab935 100644
--- a/Xi/getvers.h
+++ b/Xi/getvers.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/getvers.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 80f948de5..1193a759d 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/grabdev.h b/Xi/grabdev.h
index 1eddd24ac..63945cfd7 100644
--- a/Xi/grabdev.h
+++ b/Xi/grabdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index cbc4fd8bd..90aba5044 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h
index 8782c12ac..968499016 100644
--- a/Xi/grabdevb.h
+++ b/Xi/grabdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevb.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index d7481801b..29c01df9a 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h
index eb8db9511..4cc210c79 100644
--- a/Xi/grabdevk.h
+++ b/Xi/grabdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdevk.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 1ddcca3ae..f7b41ce64 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h
index 7d85e566e..b51db0974 100644
--- a/Xi/gtmotion.h
+++ b/Xi/gtmotion.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/gtmotion.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/listdev.c b/Xi/listdev.c
index ac4c875a1..ceb7934ef 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/listdev.h b/Xi/listdev.h
index c9553b692..6ad76b2e3 100644
--- a/Xi/listdev.h
+++ b/Xi/listdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/listdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 26210fa86..7da37e13c 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/opendev.h b/Xi/opendev.h
index 818e2d877..4c427ebb6 100644
--- a/Xi/opendev.h
+++ b/Xi/opendev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/opendev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 598ab85ae..4eb6cc153 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/queryst.h b/Xi/queryst.h
index 50d36e95e..849031b1c 100644
--- a/Xi/queryst.h
+++ b/Xi/queryst.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/queryst.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/selectev.c b/Xi/selectev.c
index a46a02928..3f6bc778f 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/selectev.h b/Xi/selectev.h
index 2327b94c5..9f20f203f 100644
--- a/Xi/selectev.h
+++ b/Xi/selectev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/selectev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index ae6f8cdc6..b4bb8a177 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/sendexev.h b/Xi/sendexev.h
index c2ace5804..f4f4b33a4 100644
--- a/Xi/sendexev.h
+++ b/Xi/sendexev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/sendexev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 52553948d..19e109c12 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/setbmap.h b/Xi/setbmap.h
index 77f097104..a7100bd7a 100644
--- a/Xi/setbmap.h
+++ b/Xi/setbmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setbmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setdval.c b/Xi/setdval.c
index fe2e13853..fcc8ac401 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/setdval.h b/Xi/setdval.h
index e6f08a64c..b3b145f9c 100644
--- a/Xi/setdval.h
+++ b/Xi/setdval.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setdval.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index 599934549..5a95c13a3 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/setfocus.h b/Xi/setfocus.h
index 1da6927b4..471c7b2b5 100644
--- a/Xi/setfocus.h
+++ b/Xi/setfocus.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setfocus.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 4c4d19c8b..a6b0ec7eb 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /********************************************************************
  *
diff --git a/Xi/setmmap.h b/Xi/setmmap.h
index 30fb57b48..9176a331b 100644
--- a/Xi/setmmap.h
+++ b/Xi/setmmap.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmmap.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 9c3feb4db..e25ecfa9f 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/setmode.h b/Xi/setmode.h
index 63a1dd35b..2edff5588 100644
--- a/Xi/setmode.h
+++ b/Xi/setmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/setmode.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 879d8e9b7..b84eec349 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.5 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * stubs.c -- stub routines for the X server side of the XINPUT
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index a1ab911fe..49ccdaa52 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h
index 9a036901f..f5c7bfec2 100644
--- a/Xi/ungrdev.h
+++ b/Xi/ungrdev.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdev.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 66ccc72af..5b17aa8e4 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h
index 500b77ebb..bc7eef70b 100644
--- a/Xi/ungrdevb.h
+++ b/Xi/ungrdevb.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index d7632db2a..422c1a732 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */
+/* $XFree86$ */
 
 /***********************************************************************
  *
diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h
index c43575ba1..005db46b1 100644
--- a/Xi/ungrdevk.h
+++ b/Xi/ungrdevk.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.h,v 3.2 2003/11/17 22:20:30 dawes Exp $ */
+/* $XFree86$ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>