projects / profile / ivi / pixman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ef3ab 282f5cf)
Merge branch 'trap-fixes'
authorSøren Sandmann Pedersen <ssp@redhat.com>
Thu, 25 Feb 2010 02:01:29 +0000 (21:01 -0500)
committerSøren Sandmann Pedersen <ssp@redhat.com>
Thu, 25 Feb 2010 02:01:29 +0000 (21:01 -0500)
1  2 
pixman/pixman-edge-imp.h patch | diff1 | diff2 | blob | history
pixman/pixman-private.h patch | diff1 | diff2 | blob | history

diff --cc pixman/pixman-edge-imp.h
Simple merge
diff --cc pixman/pixman-private.h
Simple merge
Domain: Graphics System / Rendering Engine;