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
..
dtrace	doc: add missing .gitignore for Xserver-DTrace	2010-08-09 21:17:53 -07:00
.gitignore	Use DocBook stylesheets from xorg-sgml-doctools if they're available	2010-07-23 12:41:25 -07:00
Makefile.am	Add documentation of the Xserver DTrace probes	2010-07-23 12:41:59 -07:00
xmlrules.in	Check HAVE_XMLTO_TEXT before trying to use xmlto to make text files	2010-08-09 21:17:37 -07:00
Xserver-spec.xml	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
xserver.ent.in	Show Xserver release/version date in DIX & DDX docs	2010-05-20 11:31:13 -07:00