pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-combine.c.template |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 863f9e9b7599b89c9dd42dd9c7913c2513384761
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Sun Jun 28 18:54:32 2009 -0400

    Change comma to semicolon in pixman-combine.c.template

diff --git a/pixman/pixman-combine.c.template b/pixman/pixman-combine.c.template
index 582c63e..72b4a67 100644
--- a/pixman/pixman-combine.c.template
+++ b/pixman/pixman-combine.c.template
@@ -1977,7 +1977,7 @@ _pixman_setup_combiner_functions_width (pixman_implementation_t *imp)
     imp->combine_width_ca[PIXMAN_OP_DISJOINT_SRC] = fbCombineSrcC;
     /* dest */
     imp->combine_width_ca[PIXMAN_OP_DISJOINT_OVER] = fbCombineDisjointOverC;
-    imp->combine_width_ca[PIXMAN_OP_DISJOINT_OVER_REVERSE] = fbCombineSaturateC,
+    imp->combine_width_ca[PIXMAN_OP_DISJOINT_OVER_REVERSE] = fbCombineSaturateC;
     imp->combine_width_ca[PIXMAN_OP_DISJOINT_IN] = fbCombineDisjointInC;
     imp->combine_width_ca[PIXMAN_OP_DISJOINT_IN_REVERSE] = fbCombineDisjointInReverseC;
     imp->combine_width_ca[PIXMAN_OP_DISJOINT_OUT] = fbCombineDisjointOutC;