xserver-multidpi/composite
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
..
compalloc.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
compext.c registry: Register composite extension protocol names. 2007-10-15 15:22:02 -04:00
compinit.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
compint.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
compwindow.c Remove the PaintWindow optimization. 2007-09-13 00:08:53 +00:00
Makefile.am get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00