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
..
ephyr	xserver: delete pervasively use of DISPATCH_PROC	2010-09-28 16:45:05 +03:00
fake	Remove more superfluous if(p) checks around free(p)	2010-06-06 20:27:18 +07:00
fbdev	Replace X-allocation functions with their C89 counterparts	2010-05-13 00:22:37 +07:00
linux	Revert "Add a "flags" field to DeleteInputDeviceRequest."	2010-05-26 07:54:35 -07:00
src	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
Xkdrive.man	The great kdrive purge.	2008-05-16 08:16:01 -04:00