mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-29 02:31:18 +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 @@
|
|||
/* $XFree86$ */
|
||||
/****************************************************************************
|
||||
Copyright 1987, 1988, 1989, 1990, 1991, 1992 by
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
/* $XFree86$ */
|
||||
/****************************************************************************
|
||||
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue