mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-15 00:13:28 +00:00
Merge branch 'master' into mpx
Conflicts: Xi/exevents.c dix/devices.c dix/getevents.c include/dix.h mi/mieq.c
This commit is contained in:
commit
f367285fd5
755 changed files with 16266 additions and 5261 deletions
|
|
@ -1,4 +1,3 @@
|
|||
/* $XConsortium: xf86Xinput.h /main/11 1996/10/27 11:05:29 kaleb $ */
|
||||
/*
|
||||
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in a new issue