xserver-multidpi/hw
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
..
dmx Revert "registry: Register DMX extension protocol names." 2007-11-20 17:40:57 -05:00
kdrive Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
vfb Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:54:58 -08:00
xfree86 Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xgl Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
xnest Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
xprint Xprint: Clean up generated files 2007-12-14 13:15:26 +02:00
xquartz XQuartz: *REALLY* use CFStringCreateWithCString 2007-12-21 02:09:15 -08:00
xwin Merge branch 'master' into mpx 2008-01-03 17:04:54 +10:30
Makefile.am Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:54:58 -08:00