Files
xserver/dix
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
..
2003-11-14 16:49:22 +00:00
2003-11-14 15:54:54 +00:00
2003-11-14 15:54:54 +00:00
2006-11-11 14:13:56 +02:00
2007-11-05 19:08:36 -05:00
2007-11-04 16:11:28 -08:00
2007-11-05 19:08:36 -05:00
2007-11-05 14:34:43 +00:00
2007-06-29 14:06:52 -04:00