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

This commit is contained in:
Daniel Stone 2006-07-21 19:05:41 -04:00 • committed by Daniel Stone
commit 7465010d59
1106 changed files with 3844 additions and 1744 deletions

View file

@ -3,7 +3,6 @@
*
*/
/* $Xorg: mipointrst.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */
/*
@ -29,7 +28,6 @@ Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */
#include "mipointer.h"
#include "scrnintstr.h"