Merge branch 'master' into mpx

Conflicts:

	configure.ac
	dix/events.c
	hw/xfree86/common/xf86Xinput.c
This commit is contained in:
Peter Hutterer 2007-04-12 11:11:03 +09:30
commit d4dad6f84f
75 changed files with 865 additions and 863 deletions

View file

@ -485,7 +485,10 @@ extern Bool ACDeviceAllowed(WindowPtr win,
/* Implemented by the DDX. */
extern int NewInputDeviceRequest(
InputOption *options);
InputOption *options,
DeviceIntPtr *dev);
extern void DeleteInputDeviceRequest(
DeviceIntPtr dev);
extern void DDXRingBell(
int volume,