Peter Hutterer 1f97a76476 Merge branch 'master' into mpx ...

Conflicts:

	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c

2007-06-19 17:20:52 +09:30

36 KiB

Executable File

Raw Blame History

View Raw