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:
Peter Hutterer 2007-08-12 15:31:10 +09:30
commit f367285fd5
755 changed files with 16266 additions and 5261 deletions

View file

@ -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>
*