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
..
dmx	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
kdrive	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
vfb	input: Purge Register*Device() functions.	2010-09-01 15:26:47 +10:00
xfree86	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
xnest	xnest: Replace use of Colormap->devPriv with standard devPrivates.	2010-09-13 15:55:17 -07:00
xquartz	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
xwin	Merge branch 'master' into input-api	2010-10-15 13:46:59 +10:00
Makefile.am	Catch errors in recursive relink targets	2010-03-22 00:45:57 -05:00