Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx

Conflicts:

	dix/events.c
This commit is contained in:
Peter Hutterer 2006-12-05 18:28:33 +10:30 • committed by Peter Hutterer
commit 3c8f166022
112 changed files with 6358 additions and 1896 deletions

View file

@ -20,6 +20,10 @@ Files:
mpx/listdev.c
include/mpxextinit.h
____________________________________________________________
Merging from master
== 01.12.06 ==