diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /pixman/.gitignore | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'pixman/.gitignore')
| -rw-r--r-- | pixman/.gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pixman/.gitignore b/pixman/.gitignore index 2d089fc5e..648699bf2 100644 --- a/pixman/.gitignore +++ b/pixman/.gitignore @@ -31,12 +31,15 @@ demos/checkerboard demos/clip-in demos/clip-test demos/composite-test +demos/conical-test demos/convolution-test demos/gradient-test demos/quad2quad demos/radial-test +demos/scale demos/screen-test demos/srgb-test +demos/srgb-trap-test demos/trap-test demos/tri-test pixman/pixman-srgb.c @@ -49,6 +52,7 @@ test/alpha-test test/blitters-test test/clip-in test/clip-test +test/combiner-test test/composite test/composite-test test/composite-traps-test @@ -57,13 +61,16 @@ test/fetch-test test/glyph-test test/gradient-crash-test test/gradient-test +test/infinite-loop test/lowlevel-blt-bench test/oob-test test/pdf-op-test +test/prng-test test/region-contains-test test/region-test test/region-translate test/region-translate-test +test/rotate-test test/scaling-crash-test test/scaling-helpers-test test/scaling-test |