xserver-multidpi/hw/xfree86/dri
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
..
dri.c Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
dri.h Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2007-08-23 18:19:17 -07:00
drimodule.c DRI: Fix build warning. 2007-06-11 09:23:19 +02:00
dristruct.h devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
Makefile.am Merge branch 'randr-1.2' 2006-11-27 15:43:15 -08:00
sarea.h Changes for single-entity multi-screen DRI. 2007-04-16 17:31:40 +02:00
xf86dri.c Revert "registry: Register XF86DRI extension protocol names." 2007-11-20 17:48:46 -05:00