Eamon Walsh 2d17f47cc7 Merge branch 'master' into XACE-SELINUX ... Conflicts: hw/xnest/Pixmap.c include/dix.h		2007-11-19 18:10:46 -05:00
..
darwin	xace: restore the old SaveScreens function and introduce new API, since the	2007-11-19 16:59:34 -05:00
dmx	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
kdrive	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
vfb	Xvfb: Remove usage of alloca	2007-11-05 14:34:42 +00:00
xfree86	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
xgl	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
xnest	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
xprint	Merge branch 'master' into XACE-SELINUX	2007-11-05 19:08:36 -05:00
xwin	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
Makefile.am	DDX changes for XDarwin	2007-09-06 05:34:14 -07:00