Peter Hutterer 99d28c3ef3 Merge branch 'master' into mpx ...

Conflicts:

	Xext/xprint.c (removed in master)
	config/hal.c
	dix/main.c
	hw/kdrive/ati/ati_cursor.c (removed in master)
	hw/kdrive/i810/i810_cursor.c (removed in master)
	hw/xprint/ddxInit.c (removed in master)
	xkb/ddxLoad.c

2008-05-20 10:20:14 +09:30

..

access.c

Standardise copyright headers for all new files created as part of MPX.

2008-04-25 14:50:24 +09:30

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

Bug #10464: Set pixel value to 0 before FindColor()

2008-02-29 16:42:04 -05:00

cursor.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

deprecated.c

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

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

devices.c

dix: don't undisplay cursor if we don't own a sprite.

2008-05-14 22:30:15 +09:30

dispatch.c

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

dispatch.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

dixfonts.c

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

dixutils.c

Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch

2008-04-21 20:09:20 -07:00

events.c

Xi: remove RemoveOtherCoreGrabs()

2008-04-25 16:28:58 +09:30

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 mpx

2008-05-02 11:00:14 +09:30

globals.c

Move defaultDisplayClass to xdmcp-only visibility.

2008-05-14 16:07:51 -04:00

glyphcurs.c

Add CreatePixmap allocation hints.

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

grabs.c

Merge branch 'master' into mpx

2008-01-03 17:04:54 +10:30

initatoms.c

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

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

main.c

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

Makefile.am

Merge branch 'master' into mpx

2008-05-20 10:20:14 +09:30

pixmap.c

On second thought, revert that, it'll make large pixmaps painfully slow.

2008-02-29 16:45:11 -05:00

privates.c

devPrivates rework: Free callback lists after use.

2008-01-03 23:17:06 -05:00

property.c

Merge branch 'master' into dcdc_rework

2008-04-07 07:56:41 +09:30

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 mpx

2008-03-04 18:11:10 +10:30

selection.c

Merge branch 'master' into dcdc_rework

2008-04-07 07:56:41 +09:30

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

dix: remove obsolete InitWindowPrivates().

2008-04-25 14:30:26 +09:30

xpstubs.c

X n'est pas une print API.

2008-05-12 14:15:11 -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