Peter Hutterer eaf0b6a4d8 Merge branch 'master' into input-api ...

Conflicts:
	config/udev.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86Module.h
	hw/xfree86/common/xf86Xinput.h
	hw/xfree86/os-support/linux/lnx_init.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2010-10-15 13:46:59 +10:00

..

xml

Merge branch 'master' into input-api

2010-10-15 13:46:59 +10:00

.gitignore

.gitignore: use common defaults with custom section #24239

2009-11-11 21:40:20 -08:00

c-extensions

Document more of the OS and library assumptions.

2008-07-31 15:50:23 -04:00

Makefile.am

Move Xserver-spec.xml from xorg-docs to doc/xml

2010-05-20 11:30:44 -07:00

smartsched

Merging XORG-CURRENT into trunk

2004-04-23 19:54:30 +00:00

Xserver.man.pre

Xserver(1) man page updates

2010-05-21 09:44:26 -07:00