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

9.8 KiB

Raw Blame History

View Raw