Merge branch 'master' of git+ssh://git.freedesktop.org/git/pixman into yuv-porting
authorAlan Hourihane <alanh@tungstengraphics.com>
Thu, 18 Oct 2007 16:33:43 +0000 (17:33 +0100)
committerAlan Hourihane <alanh@tungstengraphics.com>
Thu, 18 Oct 2007 16:33:43 +0000 (17:33 +0100)
commit85bccce4d863b99be4b9ce62a8ac7d95f0acab3d
tree6c0db76e396683d5895a0607e99af89fd2ba6699
parent8aa38d2256c191bf3437034f6176bae30c3c3d19
parent28532430efeb4a1aba8f3e30a790531d2a9e1472
Merge branch 'master' of git+ssh://git.freedesktop.org/git/pixman into yuv-porting

Conflicts:

pixman/pixman-compose.c
pixman/pixman.h
pixman/pixman-compose.c
pixman/pixman-mmx.c
pixman/pixman.h