Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorBrian Paul <brianp@vmware.com>
Tue, 22 Dec 2009 01:23:53 +0000 (18:23 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 22 Dec 2009 01:23:53 +0000 (18:23 -0700)
commitb57abd3bea29e95e5dee2524c3f1be4b26017c0f
tree8da85ef6e5ef40a4a7bd328fc574a27c2b8c0849
parentbf064ce0c31abb036fc035c59fdc1134705a5e3f
parente46ad402f1fecf0fc8d2538eb5abbdde97484799
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
progs/tests/packedpixels.c
src/mesa/drivers/dri/r600/r700_state.c
src/mesa/shader/slang/slang_compile.c
src/mesa/state_tracker/st_gen_mipmap.c