Peter Hutterer 88cb61e1e5 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api ...

Conflicts:
	dix/getevents.c
	hw/xfree86/common/xf86Xinput.h

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2010-11-11 12:54:46 +10:00

..

10-evdev.conf

config: only match sane devices in 10-evdev.conf

2010-04-08 15:21:00 +10:00

config-backends.h

config: add libudev input-hotplug backend

2009-12-30 19:05:44 +00:00

config.c

config: Replace xstrdup with strdup in add_option()

2010-06-11 19:05:46 +07:00

dbus-api

Hotplug: D-Bus: API version 2

2007-08-01 01:53:31 +03:00

dbus-core.c

DBUS_API_SUBJECT_TO_CHANGE is already defined on the command line

2009-02-04 09:49:54 +10:00

dbus.c

Get rid of xstrdup when argument is definitely non-NULL

2010-06-11 19:04:23 +07:00

fdi2iclass.py

config: Script to convert HAL fdi settings to InputClass sections

2010-06-11 09:31:38 +10:00

hal.c

config: expose config_info as an input option.

2010-09-01 15:26:46 +10:00

Makefile.am

config: Script to convert HAL fdi settings to InputClass sections

2010-06-11 09:31:38 +10:00

udev.c

Merge branch 'master' into input-api

2010-10-15 13:46:59 +10:00

x11-input.fdi

config: remove mention of AllowEmptyInput

2010-11-11 10:26:44 +10:00

xorg-server.conf

add basic D-BUS configuration mechanism

2006-07-21 15:19:49 -04:00