diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-19 18:10:46 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-19 18:10:46 -0500 |
| commit | 2d17f47cc7d6b174857617d31ad1b437d8e97d94 (patch) | |
| tree | 90fb5d8d63fa0c121eef355affce79d1d84a2bbe /render | |
| parent | 60be452c2e88342f92a76ba5ec7d90b5b0211aaf (diff) | |
| parent | ea9c63e93b9bb731796e8a8de2d127e6cc720076 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
Diffstat (limited to 'render')
| -rw-r--r-- | render/render.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/render/render.c b/render/render.c index 040a9507f..5fc91a948 100644 --- a/render/render.c +++ b/render/render.c @@ -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, |