Eric Anholt b4b0d901d9 Merge branch 'randr-1.2' ...

Conflicts:

	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h

2006-11-27 15:43:15 -08:00

..

atom.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -04: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

Remove RCS tags. Fix Xprint makefile braindamage.

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

cursor.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

devices.c

input: add non-keyboard bell ringing function

2006-11-01 23:10:26 +02:00

dispatch.c

CreateColormap: fix return value (bug #7083)

2006-11-08 15:29:15 +02:00

dispatch.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

dixfonts.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

2006-07-21 19:05:41 -04:00

dixutils.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular

2006-08-10 10:37:59 -07:00

events.c

Merge branch 'randr-1.2'

2006-11-27 15:43:15 -08:00

extension.c

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

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

ffs.c

ffs: handle 0 argument (bug #8968)

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

gc.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

getevents.c

Merge branch 'randr-1.2'

2006-11-27 15:43:15 -08:00

globals.c

Enable DPMS by default.

2006-09-14 18:49:12 -04:00

glyphcurs.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

grabs.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

initatoms.c

Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".

2005-07-03 08:53:54 +00:00

main.c

Issue CloseDownDevices() in os/log.c and remove from dix/main.c.

2006-11-21 21:23:17 +00:00

Makefile.am

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

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

pixmap.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

privates.c

Merge branch 'XACE-modular' into my-XACE-modular

2006-08-21 18:49:31 -04:00

property.c

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular

2006-08-10 10:37:59 -07:00

resource.c

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

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

strcasecmp.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

swaprep.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

swapreq.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

tables.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

window.c

dix/mi: still more warning fixes

2006-11-08 15:29:16 +02:00

xpstubs.c

Remove RCS tags. Fix Xprint makefile braindamage.

2006-07-21 17:56:00 -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