Merge branch 'master' into XACE-SELINUX

Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
This commit is contained in:
Eamon Walsh 2007-11-19 18:10:46 -05:00 • committed by Eamon Walsh
commit 2d17f47cc7
46 changed files with 92 additions and 977 deletions

View file

@ -1292,7 +1292,7 @@ ProcRenderAddGlyphs (ClientPtr client)
pDstPix = (pScreen->CreatePixmap) (pScreen,
width, height, depth,
CREATE_PIMXAP_USAGE_GLYPH_PICTURE);
CREATE_PIXMAP_USAGE_GLYPH_PICTURE);
GlyphPicture (glyph)[screen] = pDst =
CreatePicture (0, &pDstPix->drawable,