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
..
cw	Merge branch 'master' into XACE-SELINUX	2007-10-25 12:19:30 -04:00
damage	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
rootless	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
shadow	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
Makefile.am	merged in miext/rootless changes for XDarwin support	2007-02-16 04:12:26 -08:00