diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/src/Clip.c | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXmu/src/Clip.c')
| -rw-r--r-- | libXmu/src/Clip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXmu/src/Clip.c b/libXmu/src/Clip.c index ff87a80c0..232e4c569 100644 --- a/libXmu/src/Clip.c +++ b/libXmu/src/Clip.c @@ -444,7 +444,7 @@ XmuAreaAnd(XmuArea *dst, XmuArea *src) Z = Z->next; if (Z->y >= p->y) { - XmuScanline *q = XmuNewScanline(Z->y, 0, 0); + XmuScanline *q = XmuNewScanline(Z->y, 0, 0); XmuScanlineCopy(q, Z); XmuScanlineAnd(q, top); |