xserver/Xi
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
..
Makefile.am
allowev.c
allowev.h
chgdctl.c
chgdctl.h
chgfctl.c
chgfctl.h
chgkbd.c
chgkbd.h
chgkmap.c
chgkmap.h
chgprop.c
chgprop.h
chgptr.c
chgptr.h
closedev.c
closedev.h
devbell.c
devbell.h
exevents.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
exglobals.h
extinit.c registry: Remove registry code from XInput extension. 2007-11-20 18:46:43 -05:00
getbmap.c
getbmap.h
getdctl.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
getdctl.h
getfctl.c
getfctl.h
getfocus.c
getfocus.h
getkmap.c
getkmap.h
getmmap.c
getmmap.h
getprop.c
getprop.h
getselev.c
getselev.h
getvers.c
getvers.h
grabdev.c
grabdev.h
grabdevb.c
grabdevb.h
grabdevk.c
grabdevk.h
gtmotion.c
gtmotion.h
listdev.c
listdev.h
opendev.c
opendev.h
queryst.c
queryst.h
selectev.c
selectev.h
sendexev.c
sendexev.h
setbmap.c
setbmap.h
setdval.c
setdval.h
setfocus.c
setfocus.h
setmmap.c
setmmap.h
setmode.c
setmode.h
stubs.c
ungrdev.c
ungrdev.h
ungrdevb.c
ungrdevb.h
ungrdevk.c
ungrdevk.h