diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-12 16:45:42 +0100 |
| commit | cc6db22a772cc52ead6a5c11d7d02e7364f6326c (patch) | |
| tree | d80b42172d703ec20ccd99c68a067505e2706899 /xkbcomp/geometry.c | |
| parent | 2112b7dec49833ba872bd3ebcd7288930fec0796 (diff) | |
| parent | cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 (diff) | |
| download | vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.gz vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.tar.bz2 vcxsrv-cc6db22a772cc52ead6a5c11d7d02e7364f6326c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver xkbcomp git update 12 Mar 2014
Diffstat (limited to 'xkbcomp/geometry.c')
| -rw-r--r-- | xkbcomp/geometry.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c index 2daa213ac..5d653160e 100644 --- a/xkbcomp/geometry.c +++ b/xkbcomp/geometry.c @@ -2423,7 +2423,6 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge, ol->points, info); continue; } - outline = NULL; outline = &si->outlines[nOut++]; outline->num_points = ol->nPoints; outline->corner_radius = si->dfltCornerRadius; |