xserver: Branch 'master'

[Aaron Plattner]

 fb/fbfill.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 5138f710a1574fef6f553f3fe2fccac0620d2584 (from c9b79a355845c895aca8303a39798264d80b6212)
Author: Arcady Goldmints-Orlov <arcadyg at nvidia.com>
Date:   Wed Jun 20 16:31:55 2007 -0700

    Fixed fbSolidBoxClipped() to fill the right place.
    
    Changed an X2 to a Y1.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/fb/fbfill.c b/fb/fbfill.c
index 0d624fd..a3147ec 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -221,7 +221,7 @@ fbSolidBoxClipped (DrawablePtr	pDrawable
 	if (!and)
 	{
 	    if (pixman_fill (dst, dstStride, dstBpp,
-			     partX1 + dstXoff, partX2 + dstYoff, (partX2 - partX1), (partY2 - partY1),
+			     partX1 + dstXoff, partY1 + dstYoff, (partX2 - partX1), (partY2 - partY1),
 			     xor))
 	    {
 		fbFinishAccess (pDrawable);