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

..

animcur.c

xace: add new fields to resource access hook to allow parent resource objects

2007-09-05 11:18:36 -04:00

filter.c

Death to RCS tags.

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

glyph.c

devPrivates rework: since API is already broken, switch everything

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

glyphstr.h

devPrivates rework: since API is already broken, switch everything

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

Makefile.am

get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE

2006-07-18 18:17:38 -04:00

miglyph.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

miindex.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

mipict.c

Don't pass regions to pixman_image_composite() anymore.

2007-06-11 09:43:15 -04:00

mipict.h

Don't pass regions to pixman_image_composite() anymore.

2007-06-11 09:43:15 -04:00

mirect.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

mitrap.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

mitri.c

Remove RCS tags. Fix Xprint makefile braindamage.

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

picture.c

xace: add new fields to resource access hook to allow parent resource objects

2007-09-05 11:18:36 -04:00

picture.h

Revert "Fix <pixman.h> include to <pixman/pixman.h>"

2007-08-22 09:00:45 -07:00

picturestr.h

Merge branch 'master' into XACE-SELINUX

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

render.c

xace: add new fields to resource access hook to allow parent resource objects

2007-09-05 11:18:36 -04:00

renderedge.c

Death to RCS tags.

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

renderedge.h

Death to RCS tags.

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