Eamon Walsh a52c9b2a59 Merge branch 'master' into XACE-SELINUX ... Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c		2007-11-05 19:08:36 -05:00
..
dri.c	Merge branch 'master' into XACE-SELINUX	2007-10-25 12:19:30 -04:00
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	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00