Peter Hutterer 8da83836b6 Merge branch 'master' into mpx ...

Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c

2008-01-03 17:04:54 +10:30

..

Makefile.am

Fix build of composite, dix, and randr when Xinerama is disabled.

2007-05-24 11:20:59 -07:00

mirandr.c

Make pending properties force mode set. And, remove AttachScreen calls.

2007-03-24 00:01:47 -07:00

randr.c

Revert "registry: Register RANDR extension protocol names."

2007-11-20 17:51:27 -05:00

randrstr.h

devPrivates rework: since API is already broken, switch everything

2007-08-28 09:28:25 -04:00

rrcrtc.c

Merge branch 'master' into XACE-SELINUX

2007-11-19 18:10:46 -05:00

rrdispatch.c

Set the RandR version returned, rather than just passing the proto's version.

2007-03-15 13:21:00 -07:00

rrinfo.c

RRScanOldConfig cannot use RRFirstOutput before output is configured.

2007-08-08 12:16:32 -07:00

rrmode.c

Merge branch 'master' into XACE-SELINUX

2007-11-19 18:10:46 -05:00

rroutput.c

registry: Add some missing #include's.

2007-10-15 22:46:08 -04:00

rrpointer.c

randr: RRPointerScreenConfigured needs to move all pointers.

2007-09-05 15:08:57 +09:30

rrproperty.c

RandR: Remove usage of alloca

2007-11-05 14:34:41 +00:00

rrscreen.c

[RANDR] Compare only milliseconds of config time. (Bug #6502)

2007-08-31 21:36:37 -07:00

rrsdispatch.c

Change RandR property datatype to include pending/valid values.

2006-11-28 11:13:43 -08:00

rrxinerama.c

Revert "registry: Register XINERAMA extension protocol names."

2007-11-20 17:37:48 -05:00