xserver-multidpi/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
..
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 Death to RCS tags. 2007-06-29 14:06:52 -04:00
fballpriv.c devPrivates rework: since API is already broken, switch everything 2007-08-28 09:28:25 -04:00
fbarc.c Add the FB_ACCESS_WRAPPER checks 2007-09-27 14:55:40 +01:00
fbbits.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbbits.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbblt.c Clean up many #if 0. 2007-12-02 12:40:25 -05:00
fbbltone.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbcmap_mi.c fbcmap_mi.c: add a missing api 2007-10-02 16:55:17 +02:00
fbcmap.c s/intead/instead/ 2007-04-03 09:31:00 -06:00
fbcopy.c fb: Remove usage of alloca 2007-11-05 14:34:42 +00:00
fbfill.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbfillrect.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbfillsp.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbgc.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbgetsp.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbglyph.c Wrap libwfb memory access. 2006-08-01 13:45:43 -07:00
fbimage.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbline.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fboverlay.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
fboverlay.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
fbpict.c Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now. 2007-08-23 12:15:03 -04:00
fbpict.h - Make image_from_pict() non-static 2007-05-23 15:50:25 -04:00
fbpixmap.c Merge branch 'master' into XACE-SELINUX 2007-11-19 18:10:46 -05:00
fbpoint.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbpseudocolor.c Merge branch 'master' into XACE-SELINUX 2007-11-05 19:08:36 -05:00
fbpseudocolor.h Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
fbpush.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbrop.h Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbscreen.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
fbseg.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbsetsp.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbsolid.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbstipple.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbtile.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbtrap.c Don't unwrap too early in libwfb for Composite. 2007-08-06 14:22:49 -07:00
fbutil.c Death to RCS tags. 2007-06-29 14:06:52 -04:00
fbwindow.c Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00
Makefile.am Implement core protocol backing store exclusively in terms of Composite. 2007-08-25 15:08:20 -04:00
wfbrename.h Merge branch 'master' into XACE-SELINUX 2007-09-19 07:25:55 -04:00