xserver/fb
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
..
Makefile.am
fb.h Remove some duplicate include statements. 2007-11-20 15:18:02 -05:00
fb24_32.c Save pixmap allocation hints into the PixmapRec. 2007-11-15 12:21:25 -08:00
fb24_32.h
fballpriv.c
fbarc.c
fbbits.c
fbbits.h
fbblt.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
fbbltone.c
fbcmap.c
fbcmap_mi.c
fbcopy.c
fbfill.c
fbfillrect.c
fbfillsp.c
fbgc.c
fbgetsp.c
fbglyph.c
fbimage.c
fbline.c
fboverlay.c
fboverlay.h
fbpict.c
fbpict.h
fbpixmap.c Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
fbpoint.c
fbpseudocolor.c
fbpseudocolor.h
fbpush.c
fbrop.h
fbscreen.c
fbseg.c
fbsetsp.c
fbsolid.c
fbstipple.c
fbtile.c
fbtrap.c
fbutil.c
fbwindow.c
wfbrename.h