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
..
dri.c	Merge branch 'master' into mpx	2007-11-07 15:37:23 +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	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	Set up visuals for the existing X visuals.	2007-10-29 18:14:18 -04:00