diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
| commit | b3f7d4f6ce0d42d826f384223144936ba6797a10 (patch) | |
| tree | 2f329beffff890b402625bff8547e243071c47bd /libXft | |
| parent | c648afe73ef43a15094508d2dd439e05738735bf (diff) | |
| parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
| download | vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.gz vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.bz2 vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXft pixman mesa git update 17 dec 2012
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'libXft')
| -rw-r--r-- | libXft/man/Xft.man | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libXft/man/Xft.man b/libXft/man/Xft.man index 4ed2742d2..62439281c 100644 --- a/libXft/man/Xft.man +++ b/libXft/man/Xft.man @@ -750,7 +750,7 @@ functions) and frees the memory that was allocated for it. .nf \fBvoid\fR \fBXftDrawString8 (XftDraw *\fId\fB,\fR -\fB XRenderColor *\fIcolor\fB,\fR +\fB XftColor *\fIcolor\fB,\fR \fB XftFont *\fIfont\fB,\fR \fB int \fIx\fB,\fR \fB int \fIy\fB,\fR @@ -770,14 +770,11 @@ in .I color at position .IR x , " y" . -The -.B XRenderColor -data type is defined by the X Rendering Extension library. .PP .nf \fBvoid\fR \fBXftDrawRect (XftDraw *\fId\fB,\fR -\fB XRenderColor *\fIcolor\fB,\fR +\fB XftColor *\fIcolor\fB,\fR \fB int \fIx\fB,\fR \fB int \fIy\fB,\fR \fB unsigned int \fIwidth\fB,\fR |