Peter Hutterer d7aef3f663 Merge branch 'master' into xi2 ...

Conflicts:
	Xext/geext.c
	Xi/chdevcur.c
	Xi/extgrbdev.c
	Xi/xiproperty.c
	configure.ac
	dix/ptrveloc.c
	hw/xfree86/common/xf86Config.c
	mi/mipointer.h
	test/input.c
	xkb/xkb.c

2009-05-28 17:20:58 +10:00

15 KiB

Raw Blame History

View Raw