From: Luca Barbato <lu_zero@gentoo.org>
Date: Sat, 12 Apr 2008 07:53:24 +0000 (+0200)
Subject: Merge branch 'master' into vmx
X-Git-Tag: pixman-0.11.2~6^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ec7bd2cb2d02caca06742b0091f293d29d95a44;p=platform%2Fupstream%2Fpixman.git

Merge branch 'master' into vmx

Conflicts:

	pixman/pixman-pict.c
---

1ec7bd2cb2d02caca06742b0091f293d29d95a44
diff --cc pixman/pixman-pict.c
index 6cc81d7,f01a643..c758823
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@@ -30,10 -30,9 +30,9 @@@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
- #include "pixman.h"
 -
  #include "pixman-private.h"
  #include "pixman-mmx.h"
 +#include "pixman-vmx.h"
  #include "pixman-sse.h"
  
  #define FbFullMask(n)   ((n) == 32 ? (uint32_t)-1 : ((((uint32_t) 1) << n) - 1))