Eamon Walsh 97c150b61b Merge branch 'master' into XACE-SELINUX ...

Conflicts:

	afb/afbpntwin.c
	afb/afbscrinit.c
	afb/afbwindow.c
	cfb/cfb.h
	cfb/cfballpriv.c
	cfb/cfbscrinit.c
	cfb/cfbwindow.c
	configure.ac
	fb/wfbrename.h
	hw/xfree86/xf4bpp/ppcIO.c
	hw/xfree86/xf4bpp/ppcPntWin.c
	hw/xfree86/xf4bpp/ppcWindow.c
	hw/xfree86/xf8_32bpp/cfbscrinit.c
	mfb/mfb.h
	mfb/mfbpntwin.c
	mfb/mfbscrinit.c
	mfb/mfbwindow.c
	mi/miexpose.c

Note: conflicts caused by devPrivates rework vs. paintwindow changes.

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

..

fb24_32.c

Wrap libwfb memory access.

2006-08-01 13:45:43 -07:00

fb24_32.h

Death to RCS tags.

2007-06-29 14:06:52 -04:00

fb.h

Merge branch 'master' into XACE-SELINUX

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

fballpriv.c

devPrivates rework: since API is already broken, switch everything

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

fbarc.c

Death to RCS tags.

2007-06-29 14:06:52 -04: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

Death to RCS tags.

2007-06-29 14:06:52 -04:00

fbbltone.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

fbcmap_mi.c

Split the xserver/fb/fbcmap.c file into two files.

2007-04-03 09:28:21 -06:00

fbcmap.c

s/intead/instead/

2007-04-03 09:31:00 -06:00

fbcopy.c

Bug #12015: Use the right offsets in the dst arguments of pixman_blt.

2007-08-16 14:57:32 -07: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-09-19 07:25:55 -04: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

devPrivates rework: since API is already broken, switch everything

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

fbpoint.c

Death to RCS tags.

2007-06-29 14:06:52 -04:00

fbpseudocolor.c

Merge branch 'master' into XACE-SELINUX

2007-09-19 07:25:55 -04: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