xserver-multidpi/hw
Peter Hutterer 0b729051c0 Merge branch 'master' into mpx
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
..
darwin pulling more patches over from xorg-xserver-1.2-apple branch 2007-11-05 05:45:21 -08:00
dmx DMX: Remove usage of alloca 2007-11-05 14:34:42 +00:00
kdrive Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
vfb Xvfb: Remove usage of alloca 2007-11-05 14:34:42 +00:00
xfree86 Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
xgl Add CreatePixmap allocation hints. 2007-11-04 16:11:28 -08:00
xnest Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
xprint Xprint: Remove usage of alloca 2007-11-05 14:34:42 +00:00
xwin Merge branch 'master' into mpx 2007-11-07 15:37:23 +10:30
Makefile.am DDX changes for XDarwin 2007-09-06 05:34:14 -07:00