Peter Hutterer da728f2127 dix: don't use serverClient in AddInputDevice, use the one supplied instead. ... We pass in the client that wants to create the device anyway, lets use the parameter instead of hardcoding the serverClient. Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't have enough coffee that day.		2008-05-14 15:17:05 +09:30
afb	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
composite	XACE: Adjust the location of the COMPOSITE creation hook.	2008-02-28 21:52:32 -05:00
config	config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.	2008-05-08 16:58:31 +09:30
damageext	Revert "registry: Register DAMAGE extension protocol names."	2007-11-20 17:31:00 -05:00
dbe	Revert "registry: Register DBE extension protocol names."	2007-11-20 17:32:35 -05:00
dix	dix: don't use serverClient in AddInputDevice, use the one supplied instead.	2008-05-14 15:17:05 +09:30
doc	Merge branch 'master' into XACE-SELINUX	2007-11-19 18:10:46 -05:00
exa	EXA: Fall back in CompositeRects if the driver can't accelerate Composite.	2008-05-01 15:10:52 +02:00
fb	Removed fbpseudocolor.h from sdk_HEADERS.	2008-04-19 12:54:40 +02:00
GL	XQuartz: Compile in missing glx source that we still need	2008-04-24 18:24:46 -07:00
hw	xfree86: remove Ubuntu-ism.	2008-05-13 11:17:39 +09:30
include	Remove UndisplayCursor API.	2008-05-13 11:17:02 +09:30
mfb	devPrivates rework: put back some changes that were mistakenly removed	2007-11-20 15:31:44 -05:00
mi	mi: protect against NULL-pointer dereference.	2008-05-14 09:42:50 +09:30
miext	Make rootless use dixLookupClient rather than deprecated LookupClient.	2008-04-21 20:09:30 -07:00
os	Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac	2008-04-25 16:49:35 +09:30
randr	Merge branch 'master' into dcdc_rework	2008-04-07 07:56:41 +09:30
record	Merge branch 'master' into mpx	2008-01-03 17:04:54 +10:30
render	render: don't dereference cursor if cursor is NULL.	2008-05-13 11:17:02 +09:30
Xext	Xext: emulate XI events from core events when faking input.	2008-05-13 20:00:08 +09:30
xfixes	Merge branch 'master' into mpx	2008-03-04 18:11:10 +10:30
Xi	Xi: Fix up ProcIVector, got out of sync with the protocol.	2008-05-13 11:17:02 +09:30
xkb	Merge branch 'master' into mpx	2008-04-22 18:04:05 +09:30
XTrap	Merge branch 'master' into mpx	2008-01-03 17:04:54 +10:30
.gitignore	.gitignore: Added Xquartz stuff	2008-04-21 19:08:28 -07:00
acinclude.m4	Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version	2008-04-16 18:38:38 -07:00
autogen.sh	DeliverEventsToWindow: ensure that genericMask has a defined value.	2007-07-10 19:11:30 +09:30
configure.ac	Merge branch 'master' into mpx	2008-05-02 11:00:14 +09:30
COPYING	Standardise copyright headers for all new files created as part of MPX.	2008-04-25 14:50:24 +09:30
cpprules.in	For MANDEFS, also replace __mandir__ for $(mandir) which includes	2006-12-08 15:51:44 -06:00
Makefile.am	So long, and thanks for all the cfb.	2008-04-11 09:47:51 -04:00
xorg-server.m4	Add xorg-server.m4 for driver dependency checking.	2005-11-01 15:01:51 +00:00
xorg-server.pc.in	Include pciaccess in the xorg-server.pc Requires line.	2008-04-15 14:51:51 -07:00