Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

2006-07-21 19:05:41 -04:00
parent 1d31ed7782 0aaac95b0d
commit 7465010d59
1106 changed files with 3845 additions and 1745 deletions
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
 /************************************************************

 Copyright 1987, 1998  The Open Group
@@ -46,7 +45,6 @@ SOFTWARE.

 ********************************************************/

-/* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */

 #ifndef INPUTSTRUCT_H
 #define INPUTSTRUCT_H