Peter Hutterer e8777a91f3 Merge branch 'master' into mpx ...

Conflicts:

	Xi/closedev.c
	Xi/exevents.c
	Xi/extinit.c
	Xi/listdev.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	include/extinit.h
	mi/mipointer.c

2007-04-02 15:36:26 +09:30

33 KiB

Raw Blame History

View Raw