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

Conflicts:
	dix/getevents.c
	hw/xfree86/common/xf86Xinput.h

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2010-11-11 12:54:46 +10:00
commit 88cb61e1e5
122 changed files with 845 additions and 2522 deletions

View file

@ -45,11 +45,6 @@
See the evdev documentation for more information.
You will probably want to add the following option to the ServerFlags of
your xorg.conf:
Option "AllowEmptyInput" "True"
FIXME: Support tablets too.
TODO: I think its fixed, can't test