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

Conflicts:

	configure.ac
	dix/getevents.c
	hw/xfree86/ramdac/xf86Cursor.c
	mi/mipointer.c
	xkb/xkbUtils.c

2007-03-05 12:37:17 +10:30

12 KiB

Raw Blame History

View Raw