mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-22 20:35:43 +00:00
Merge branch 'master' into mpx
Conflicts: configure.ac dix/events.c hw/xfree86/common/xf86Xinput.c
This commit is contained in:
commit
d4dad6f84f
75 changed files with 865 additions and 863 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue