Peter Hutterer 88cb61e1e5 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>		2010-11-11 12:54:46 +10:00
..
.gitignore	…
Makefile.am	…
Xorg.man.pre	xfree86: Document terminate not mapped by default (bug 25083)	2010-09-01 14:44:40 +10:00
xorg.conf.man.pre	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api	2010-11-11 12:54:46 +10:00