xserver-multidpi/hw
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
..
darwin Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
dmx Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
kdrive Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -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-05 19:08:36 -05:00
xgl Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xnest Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -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-05 19:08:36 -05:00
Makefile.am DDX changes for XDarwin 2007-09-06 05:34:14 -07:00