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
..
apple	XDarwin: pulling in Indirect GLX fixes from downstream	2007-09-20 19:27:31 -07:00
glx	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
mesa	add slang_mem.c	2007-04-21 12:40:51 -06:00
windows	Replace all uses of __glEvalComputeK (and the doubly redundant	2005-09-28 03:37:22 +00:00
Makefile.am	DDX changes for XDarwin	2007-09-06 05:34:14 -07:00
symlink-mesa.sh	GLcore: fix after moving xf86glx_util.[hc] to Mesa.	2007-04-06 13:38:12 +03:00