Go to file
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
afb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
cfb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
cfb32 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
composite Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
config Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
damageext registry: Register DAMAGE extension protocol names. 2007-10-15 18:56:59 -04:00
dbe Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
dix Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
doc Add Xserver man section about catalogue:<dir> FPE 2007-09-04 17:20:28 -07:00
exa Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
fb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
GL Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
hw Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
include Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
mfb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
mi Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
miext Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
os Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
randr Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
record Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
render Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
Xext Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xfixes registry: Register XFixes extension protocol names. 2007-10-15 18:31:40 -04:00
Xi Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
xkb Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
XTrap Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
.gitignore Add more generated files to .gitignore. 2007-08-29 16:05:23 -07:00
acinclude.m4 Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4 2007-07-25 17:42:23 -07:00
autogen.sh Use canonical autogen.sh, which supports srcdir != objdir autogen. 2005-07-01 21:13:36 +00:00
configure.ac Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
COPYING Add proper COPYING file 2007-08-01 08:07:08 +03:00
cpprules.in For MANDEFS, also replace __mandir__ for $(mandir) which includes 2006-12-08 15:51:44 -06:00
Makefile.am Generate ChangeLog file for make dist. 2007-07-10 21:33:54 -07:00
xorg-server.m4 Add xorg-server.m4 for driver dependency checking. 2005-11-01 15:01:51 +00:00
xorg-server.pc.in Export the server ABI versions from xorg-server.pc 2007-11-05 17:18:46 -05:00