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

..

atom.c

Small static cleanups on dix/

2007-11-15 17:01:33 -05:00

buildatoms

XFree86 4.3.0.1

2003-11-14 16:49:22 +00:00

BuiltInAtoms

R6.6 is the Xorg base-line

2003-11-14 15:54:54 +00:00

CHANGES

R6.6 is the Xorg base-line

2003-11-14 15:54:54 +00:00

colormap.c

Merge branch 'master' into XACE-SELINUX

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

cursor.c

xace: add new fields to resource access hook to allow parent resource objects

2007-09-05 11:18:36 -04:00

deprecated.c

dix: add new, combined resource lookup function. Move all dix lookup API

2007-04-04 16:00:15 -04:00

devices.c

Merge branch 'master' into XACE-SELINUX

2007-11-14 13:35:50 -05:00

dispatch.c

registry: add missing include statement.

2007-11-26 16:54:33 -05:00

dispatch.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

dixfonts.c

Merge branch 'master' into XACE-SELINUX

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

dixutils.c

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

2007-08-16 10:57:49 -04:00

events.c

Merge branch 'master' into XACE-SELINUX

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

extension.c

registry: swap out the DTRACE XErrorDB stuff for the new registry call.

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

ffs.c

ffs: handle 0 argument (bug #8968)

2006-11-11 14:13:56 +02:00

gc.c

Merge branch 'master' into XACE-SELINUX

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

getevents.c

Merge branch 'master' into XACE-SELINUX

2007-11-14 13:35:50 -05:00

globals.c

Remove all traces of external RGB database (and Speedo)

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

glyphcurs.c

Add CreatePixmap allocation hints.

2007-11-04 16:11:28 -08:00

grabs.c

Merge branch 'master' into XACE-SELINUX

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

initatoms.c

Bug #10560: Code-Cleanup: function declarations () -> (void)

2007-04-09 14:33:15 -07:00

main.c

Merge branch 'master' into XACE-SELINUX

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

Makefile.am

registry: Add a great big list of protocol names, like the XErrorDB that

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

pixmap.c

Merge branch 'master' into XACE-SELINUX

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

privates.c

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

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

property.c

Merge branch 'master' into XACE-SELINUX

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

protocol.txt

registry: Add a great big list of protocol names, like the XErrorDB that

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

registry.c

registry: Add a call for DTRACE compatibility.

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

resource.c

Merge branch 'master' into XACE-SELINUX

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

strcasecmp.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

swaprep.c

DIX: Remove usage of alloca

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

swapreq.c

dix: remove 'register' keyword for all variables.

2007-03-08 17:50:25 +10:30

tables.c

Remove the old Kerberos 5 authentication code.

2007-06-04 18:07:00 -04:00

window.c

Merge branch 'master' into XACE-SELINUX

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

xpstubs.c

Death to RCS tags.

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

Xserver-dtrace.h.in

Add DTrace probe points for X server <-> client communications

2006-11-03 12:54:43 -08:00

Xserver.d

Add DTrace probe points for X server <-> client communications

2006-11-03 12:54:43 -08:00