xserver-multidpi/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
..
allowev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
allowev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgdctl.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgdctl.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgfctl.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgfctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
chgkbd.c Input: Return errors to the dispatcher instead of sending them ourself. 2007-09-26 07:26:59 -04:00
chgkbd.h Xi: disallow changing core keyboard and pointer 2006-10-29 03:43:34 +03:00
chgkmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgkmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgprop.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgprop.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
chgptr.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
chgptr.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
closedev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
closedev.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
devbell.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
devbell.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
exevents.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
exglobals.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
extinit.c registry: Remove registry code from XInput extension. 2007-11-20 18:46:43 -05:00
getbmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getbmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getdctl.c Merge branch 'master' into XACE-SELINUX 2007-12-13 18:38:25 -05:00
getdctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
getfctl.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getfctl.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
getfocus.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getfocus.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getkmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getkmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getmmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getmmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getprop.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getprop.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getselev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getselev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
getvers.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
getvers.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
grabdev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdevb.c xace: add hooks + new access codes: XKB extension. 2007-09-28 13:34:18 -04:00
grabdevb.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
grabdevk.c xace: add hooks + new access codes: XKB extension. 2007-09-28 13:34:18 -04:00
grabdevk.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
gtmotion.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
gtmotion.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
listdev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
listdev.h Static cleanup on Xi/ 2007-03-25 21:18:39 -04:00
Makefile.am get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE 2006-07-18 18:17:38 -04:00
opendev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
opendev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
queryst.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
queryst.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
selectev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
selectev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
sendexev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
sendexev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setbmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setbmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setdval.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setdval.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setfocus.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setfocus.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setmmap.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setmmap.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
setmode.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
setmode.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
stubs.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
ungrdev.c xace: add new hooks + access controls: XInput extension. 2007-09-28 08:02:00 -04:00
ungrdev.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
ungrdevb.c xace: add hooks + new access codes: XKB extension. 2007-09-28 13:34:18 -04:00
ungrdevb.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00
ungrdevk.c xace: add hooks + new access codes: XKB extension. 2007-09-28 13:34:18 -04:00
ungrdevk.h indent fixes (OMG SO UGLY), and nuke old RCS keywords. 2006-02-20 22:16:49 +00:00