Peter Hutterer 1f97a76476 Merge branch 'master' into mpx ... Conflicts: dix/devices.c hw/xfree86/common/xf86Xinput.c hw/xfree86/loader/xf86sym.c mi/mieq.c		2007-06-19 17:20:52 +09:30
..
dri.c	Merge branch 'master' into mpx	2007-06-19 17:20:52 +09:30
dri.h	DRI: Add TexOffset driver hooks.	2007-05-22 10:51:52 +02:00
drimodule.c	DRI: Fix build warning.	2007-06-11 09:23:19 +02:00
dristruct.h	Changes for single-entity multi-screen DRI.	2007-04-16 17:31:40 +02: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	DRI: Clip cliprects obtained from DRIGetDrawableInfo to screen dimensions.	2007-06-11 09:23:19 +02:00