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

..

bstore.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

bstorestr.h

Implement core protocol backing store exclusively in terms of Composite.

2007-08-25 15:08:20 -04:00

closestr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

closure.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

colormap.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

colormapst.h

devPrivates rework: since API is already broken, switch everything

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

cursor.h

Darwin: Use __APPLE__ instead of __DARWIN__

2007-12-07 18:54:58 -08:00

cursorstr.h

devPrivates rework: convert CursorRec and CursorBits over to new interface.

2007-08-30 11:40:39 -04:00

dix-config.h.in

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

dix.h

Merge branch 'master' into XACE-SELINUX

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

dixaccess.h

dix: Add a bunch of new access codes.

2007-05-24 12:20:24 -04:00

dixevents.h

Clean up many #if 0.

2007-12-02 12:40:25 -05:00

dixfont.h

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

dixfontstr.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

dixgrabs.h

dix: Add client parameter to AddPassiveGrabsToList().

2007-10-18 12:24:55 -04:00

dixstruct.h

Merge branch 'master' into XACE-SELINUX

2007-11-05 19:08:36 -05:00

exevents.h

Xi: Include XI protocol header in exevents.h

2007-10-28 15:49:56 +02:00

extension.h

devPrivates rework: since API is already broken, switch everything

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

extinit.h

xace: add new hooks + access controls: XInput extension.

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

extnsionst.h

devPrivates rework: since API is already broken, switch everything

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

gc.h

xace: add hooks + new access codes: core protocol GC requests

2007-08-14 13:09:38 -04:00

gcstruct.h

devPrivates rework: since API is already broken, switch everything

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

globals.h

Remove all traces of external RGB database (and Speedo)

2007-11-05 16:28:35 +00:00

hotplug.h

Convert all my license statements to the standard form

2007-08-01 01:53:31 +03:00

input.h

xace: add hooks + new access codes: XKB extension.

2007-09-28 13:34:18 -04:00

inputstr.h

Merge branch 'master' into XACE-SELINUX

2007-09-19 07:25:55 -04:00

kdrive-config.h.in

kdrive: numerous warning fixes

2006-10-23 06:08:27 +03:00

Makefile.am

dix: Add a new "registry" mechanism for registering string names of things.

2007-10-11 14:18:59 -04:00

misc.h

Turn boxes and regions into typedefs for pixman types

2007-05-15 11:13:14 -04:00

miscstruct.h

Merge branch 'master' into XACE-SELINUX

2007-08-28 07:25:21 -04:00

opaque.h

dix: add whiteroot flag

2006-08-18 17:04:48 +03:00

os.h

Merge branch 'master' into XACE-SELINUX

2007-11-05 19:08:36 -05:00

pixmap.h

Death to RCS tags.

2007-06-29 14:06:52 -04:00

pixmapstr.h

Merge branch 'master' into XACE-SELINUX

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

privates.h

devPrivates rework: register an offset for every resource type, use

2007-09-06 16:55:51 -04:00

property.h

xace: update the DeleteProperty prototype to include the client argument.

2007-10-16 19:11:36 -04:00

propertyst.h

dix: devPrivates support for PropertyRec.

2007-03-22 10:59:21 -04:00

region.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

regionstr.h

Add new InitRegions() function called from dix/main

2007-05-15 11:13:15 -04:00

registry.h

registry: Add a call for DTRACE compatibility.

2007-11-26 15:59:01 -05:00

resource.h

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

rgb.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

screenint.h

devPrivates rework: since API is already broken, switch everything

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

scrnintstr.h

Merge branch 'master' into XACE-SELINUX

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

selection.h

xace: Bug fixes, name changes to selection access hooks and fields.

2007-10-19 18:43:38 -04:00

servermd.h

Restore checks for __i386 where needed for Sun compilers on Solaris

2007-11-20 18:31:07 -08:00

site.h

Remove all traces of external RGB database (and Speedo)

2007-11-05 16:28:35 +00:00

swaprep.h

General DIX static and dead code cleanup.

2007-03-25 17:57:54 -04:00

swapreq.h

Clean up many #if 0.

2007-12-02 12:40:25 -05:00

validate.h

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04:00

window.h

Merge branch 'master' into XACE-SELINUX

2007-12-13 18:38:25 -05:00

windowstr.h

devPrivates rework: move devPrivates field in drawable structure types

2007-09-19 13:59:35 -04:00

xgl-config.h.in

Initial commit of XGL build infrastructure and XGL code changes for

2005-12-28 10:31:46 +00:00

XIstubs.h

Xi: disallow changing core keyboard and pointer

2006-10-29 03:43:34 +03:00

xkb-config.h.in

Fix remnants of previous busted _XkbStrCaseCmp commit.

2006-03-27 22:28:32 +00:00

xkbsrv.h

Merge branch 'master' into XACE-SELINUX

2007-11-05 19:08:36 -05:00

xorg-config.h.in

Merge branch 'master' into XACE-SELINUX

2007-10-25 12:19:30 -04:00

xorg-server.h.in

Merge branch 'master' into XACE-SELINUX

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

xwin-config.h.in

Define XFree86Server only where it is required.

2005-12-02 06:02:45 +00:00