Ian Romanick 8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework ... Conflicts: hw/xfree86/common/xf86.h hw/xfree86/common/xf86Init.c hw/xfree86/common/xf86pciBus.c hw/xfree86/int10/generic.c hw/xfree86/int10/helper_exec.c hw/xfree86/loader/xf86sym.c hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/Pci.h hw/xfree86/os-support/bus/linuxPci.c hw/xfree86/os-support/linux/int10/linux.c		2007-08-23 18:19:17 -07:00
..
dri.c	Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework	2007-08-23 18:19:17 -07: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	Don't map the front buffer in libdri if the ddx driver doesn't set the size.	2007-07-27 09:55:27 -07: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	Make sure DRI drawables are cleaned up when client dies.	2007-07-10 09:02:08 +02:00