Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/privates.c
This commit is contained in:
Eamon Walsh
2007-04-17 12:10:22 -04:00
committed by Eamon Walsh
64 changed files with 1363 additions and 639 deletions

View File

@@ -444,7 +444,10 @@ extern DeviceIntPtr LookupDeviceIntRec(
/* Implemented by the DDX. */
extern int NewInputDeviceRequest(
InputOption *options);
InputOption *options,
DeviceIntPtr *dev);
extern void DeleteInputDeviceRequest(
DeviceIntPtr dev);
extern void DDXRingBell(
int volume,