diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-10-25 12:19:30 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-10-25 12:19:30 -0400 |
| commit | b633d54b94d746d26e13014634d9f63bbb7e8f7d (patch) | |
| tree | 4832d035672164284ff8698d5875e9d5435f494a /render/picturestr.h | |
| parent | 4b05f19cb9e42d8c8eff5ca4e463f5bc2a05433d (diff) | |
| parent | 48ca5961caee62f2980017a6bdc96a1b4c747727 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
Diffstat (limited to 'render/picturestr.h')
| -rw-r--r-- | render/picturestr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/render/picturestr.h b/render/picturestr.h index 5444e519c..4dfa94402 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -342,7 +342,7 @@ typedef struct _PictureScreen { ValidatePictureProcPtr ValidatePicture; CompositeProcPtr Composite; - GlyphsProcPtr Glyphs; + GlyphsProcPtr Glyphs; /* unused */ CompositeRectsProcPtr CompositeRects; DestroyWindowProcPtr DestroyWindow; |