mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-27 02:09:56 +00:00
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts: dix/events.c
This commit is contained in:
commit
3c8f166022
112 changed files with 6358 additions and 1896 deletions
|
|
@ -20,6 +20,10 @@ Files:
|
|||
mpx/listdev.c
|
||||
include/mpxextinit.h
|
||||
|
||||
____________________________________________________________
|
||||
|
||||
Merging from master
|
||||
|
||||
|
||||
== 01.12.06 ==
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue