xserver-multidpi/hw
Peter Hutterer 99d28c3ef3 Merge branch 'master' into mpx
Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
..
dmx dmx: fix build. 2008-05-14 16:18:48 +09:30
kdrive Merge branch 'master' into mpx 2008-05-20 10:20:14 +09:30
vfb mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite(). 2008-05-16 21:10:00 +09:30
xfree86 Merge branch 'master' into mpx 2008-05-20 10:20:14 +09:30
xgl Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
xnest Merge branch 'master' into mpx 2008-05-20 10:20:14 +09:30
xquartz Merge branch 'master' into mpx 2008-05-20 10:20:14 +09:30
xwin Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac 2008-04-25 16:49:35 +09:30
Makefile.am X n'est pas une print API. 2008-05-12 14:15:11 -04:00