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
..
config-backends.h	Convert all my license statements to the standard form	2007-08-01 01:53:31 +03:00
config.c	Config: Add missing include	2007-08-01 07:27:30 +03:00
dbus-api	Hotplug: D-Bus: API version 2	2007-08-01 01:53:31 +03:00
dbus-core.c	Don't segfault on shutdown if we never managed to connect to dbus.	2007-09-20 16:22:24 -07:00
dbus.c	xace: add new hooks + access controls: XInput extension.	2007-09-28 08:02:00 -04:00
hal.c	Config: HAL: Touchpads are pointers too	2007-11-04 16:46:21 +00:00
Makefile.am	Build system: Add missing files	2007-08-01 08:11:22 +03:00
x11-input.fdi	config: fix default xkb model (pc105, not keyboard)	2007-08-21 18:17:35 +02:00
xorg-server.conf	add basic D-BUS configuration mechanism	2006-07-21 15:19:49 -04:00