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

..

cfb8bit.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb8bit.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb8line.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb16.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb24.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb32.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfb.h

devPrivates rework: put back a comment that was mistakenly removed

2007-11-19 21:01:22 -05:00

cfballpriv.c

Merge branch 'master' into XACE-SELINUX

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

cfbbitblt.c

cfb: Remove usage of alloca

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

cfbblt.c

cfb: Remove usage of alloca

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

cfbbres.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbbresd.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbcmap.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbcppl.c

Clean up many #if 0.

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

cfbfillarc.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbfillrct.c

cfb: Remove usage of alloca

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

cfbfillsp.c

cfb: Remove usage of alloca

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

cfbgc.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbgetsp.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbglblt8.c

cfb: Remove usage of alloca

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

cfbhrzvert.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbigblt8.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbimage.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbline.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbmap.h

Merge branch 'master' into XACE-SELINUX

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

cfbmskbits.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbmskbits.h

Clean up many #if 0.

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

cfbpixmap.c

Merge branch 'master' into XACE-SELINUX

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

cfbply1rct.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbpolypnt.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbpush8.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbrctstp8.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbrrop.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbrrop.h

devPrivates rework: since API is already broken, switch everything

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

cfbscrinit.c

Merge branch 'master' into XACE-SELINUX

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

cfbsetsp.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbsolid.c

cfb: Remove usage of alloca

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

cfbteblt8.c

StorePixels() macro could create invalid *x++=*x... code - fixed.

2006-10-17 17:06:44 +02:00

cfbtegblt.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbtile32.c

cfb: Remove usage of alloca

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

cfbtileodd.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

cfbunmap.h

Merge branch 'master' into XACE-SELINUX

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

cfbwindow.c

Merge branch 'master' into XACE-SELINUX

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

cfbzerarc.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

Makefile.am

Clean up many #if 0.

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

Makefile.am.inc

Remove the PaintWindow optimization.

2007-09-13 00:08:53 +00:00

stip68kgnu.h

Remove RCS tags. Fix Xprint makefile braindamage.

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

stipmips.s

R6.6 is the Xorg base-line

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

stipsparc.s

xc/config/cf/sun.cf

2004-04-26 02:39:58 +00:00

stipsprc32.s

xc/config/cf/sun.cf

2004-04-26 02:39:58 +00:00