diff options
| author | Julien Cristau <[email protected]> | 2009-12-29 10:16:21 +0000 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2009-12-29 10:16:21 +0000 |
| commit | 7030b61d99bb557e3a498b43684f13c3a6b6e9ce (patch) | |
| tree | bd988c677d68166dd6ee6adc62cc9831b5a86acf /src/gallium/drivers/nv04/nv04_screen.c | |
| parent | 7f8952d242c0cda6840bb7a2975fd27ec6740dd8 (diff) | |
| parent | da876fa3a5df77763fe106b5e0a17b2e672a506c (diff) | |
Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable
Conflicts:
progs/tests/bug_texstore_i8.c
progs/tests/crossbar.c
progs/tests/cva.c
progs/tests/fptest1.c
progs/tests/invert.c
progs/tests/packedpixels.c
progs/tests/quads.c
progs/tests/scissor-viewport.c
progs/tests/scissor.c
progs/tests/stencilwrap.c
progs/tests/tex1d.c
progs/tests/texcomp_image.h
progs/tests/unfilledclip.c
progs/tests/vpeval.c
progs/trivial/clear-fbo-tex.c
progs/trivial/createwin.c
progs/trivial/dlist-begin-call-end.c
progs/trivial/draw2arrays.c
progs/trivial/drawarrays.c
progs/trivial/tri-blend-max.c
progs/trivial/tri-blend-min.c
progs/trivial/tri-blend-revsub.c
progs/trivial/tri-blend-sub.c
progs/trivial/tri-blend.c
progs/trivial/tri-fbo-tex.c
progs/trivial/tri-fp.c
progs/trivial/tri-logicop-none.c
progs/trivial/tri-logicop-xor.c
progs/trivial/tri-z.c
progs/trivial/vbo-drawarrays.c
progs/trivial/vbo-noninterleaved.c
scons/gallium.py
scons/generic.py
Diffstat (limited to 'src/gallium/drivers/nv04/nv04_screen.c')
0 files changed, 0 insertions, 0 deletions