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
..
dbe.c	registry: Register DBE extension protocol names.	2007-10-15 18:18:57 -04:00
dbestruct.h	devPrivates rework: since API is already broken, switch everything	2007-08-28 09:28:25 -04:00
Makefile.am	get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE	2006-07-18 18:17:38 -04:00
midbe.c	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
midbe.h	Death to RCS tags.	2007-06-29 14:06:52 -04:00
midbestr.h	devPrivates rework: since API is already broken, switch everything	2007-08-28 09:28:25 -04:00